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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
f4803993
Commit
f4803993
authored
Oct 12, 2018
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop complaining about unicorn.rb
parent
1103f589
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
config/unicorn.rb.example
config/unicorn.rb.example
+2
-2
config/unicorn.rb.example.development
config/unicorn.rb.example.development
+2
-2
No files found.
config/unicorn.rb.example
View file @
f4803993
...
@@ -95,7 +95,7 @@ end
...
@@ -95,7 +95,7 @@ end
before_fork do |server, worker|
before_fork do |server, worker|
# 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
defined?(ActiveRecord::Base)
and
defined?(ActiveRecord::Base)
&&
ActiveRecord::Base.connection.disconnect!
ActiveRecord::Base.connection.disconnect!
# The following is only recommended for memory/DB-constrained
# The following is only recommended for memory/DB-constrained
...
@@ -133,7 +133,7 @@ after_fork do |server, worker|
...
@@ -133,7 +133,7 @@ after_fork do |server, worker|
# server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
# server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
# the following is *required* for Rails + "preload_app true",
# the following is *required* for Rails + "preload_app true",
defined?(ActiveRecord::Base)
and
defined?(ActiveRecord::Base)
&&
ActiveRecord::Base.establish_connection
ActiveRecord::Base.establish_connection
# reset prometheus client, this will cause any opened metrics files to be closed
# reset prometheus client, this will cause any opened metrics files to be closed
...
...
config/unicorn.rb.example.development
View file @
f4803993
...
@@ -7,7 +7,7 @@ check_client_connection false
...
@@ -7,7 +7,7 @@ check_client_connection false
before_fork do |server, worker|
before_fork do |server, worker|
# 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
defined?(ActiveRecord::Base)
and
defined?(ActiveRecord::Base)
&&
ActiveRecord::Base.connection.disconnect!
ActiveRecord::Base.connection.disconnect!
if /darwin/ =~ RUBY_PLATFORM
if /darwin/ =~ RUBY_PLATFORM
...
@@ -27,6 +27,6 @@ after_fork do |server, worker|
...
@@ -27,6 +27,6 @@ after_fork do |server, worker|
require 'rbtrace' if ENV['ENABLE_RBTRACE']
require 'rbtrace' if ENV['ENABLE_RBTRACE']
# the following is *required* for Rails + "preload_app true",
# the following is *required* for Rails + "preload_app true",
defined?(ActiveRecord::Base)
and
defined?(ActiveRecord::Base)
&&
ActiveRecord::Base.establish_connection
ActiveRecord::Base.establish_connection
end
end
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