Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d2518fb8
Commit
d2518fb8
authored
Feb 20, 2020
by
nmilojevic1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fold logic inside one on_before_fork
parent
31dad0fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
config/initializers/active_record_lifecycle.rb
config/initializers/active_record_lifecycle.rb
+1
-5
No files found.
config/initializers/active_record_lifecycle.rb
View file @
d2518fb8
...
@@ -12,14 +12,10 @@ if defined?(ActiveRecord::Base) && !Gitlab::Runtime.sidekiq?
...
@@ -12,14 +12,10 @@ if defined?(ActiveRecord::Base) && !Gitlab::Runtime.sidekiq?
end
end
end
end
if
defined?
(
ActiveRecord
::
Base
)
&&
Gitlab
::
Runtime
.
web_server?
if
defined?
(
ActiveRecord
::
Base
)
Gitlab
::
Cluster
::
LifecycleEvents
.
on_before_fork
do
Gitlab
::
Cluster
::
LifecycleEvents
.
on_before_fork
do
raise
'ActiveRecord connection not established. Unable to start.'
unless
Gitlab
::
Database
.
exists?
raise
'ActiveRecord connection not established. Unable to start.'
unless
Gitlab
::
Database
.
exists?
end
end
if
defined?
(
ActiveRecord
::
Base
)
Gitlab
::
Cluster
::
LifecycleEvents
.
on_before_fork
do
# the following is highly recommended for Rails + "preload_app true"
# the following is highly recommended for Rails + "preload_app true"
# as there's no need for the master process to hold a connection
# as there's no need for the master process to hold a connection
ActiveRecord
::
Base
.
connection
.
disconnect!
ActiveRecord
::
Base
.
connection
.
disconnect!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment