diff options
| author | Brett Walker <bwalker@gitlab.com> | 2018-10-12 14:08:13 -0500 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2018-10-12 14:08:13 -0500 |
| commit | f48039933435f32a0f7aeb24a491cb5ba12eb516 (patch) | |
| tree | 92633ec27ed7abe2abce831967a9653659fc1c84 | |
| parent | 1103f589f0a77bf11ca3103165fb287a6d092eb5 (diff) | |
| download | gitlab-ce-f48039933435f32a0f7aeb24a491cb5ba12eb516.tar.gz | |
Fix rubocop complaining about unicorn.rb
| -rw-r--r-- | config/unicorn.rb.example | 4 | ||||
| -rw-r--r-- | config/unicorn.rb.example.development | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 020e9a00d87..e06cce3e97a 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -95,7 +95,7 @@ end before_fork do |server, worker| # the following is highly recommended for Rails + "preload_app true" # as there's no need for the master process to hold a connection - defined?(ActiveRecord::Base) and + defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect! # The following is only recommended for memory/DB-constrained @@ -133,7 +133,7 @@ after_fork do |server, worker| # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) # the following is *required* for Rails + "preload_app true", - defined?(ActiveRecord::Base) and + defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection # reset prometheus client, this will cause any opened metrics files to be closed diff --git a/config/unicorn.rb.example.development b/config/unicorn.rb.example.development index 5712549a66d..f31df66015a 100644 --- a/config/unicorn.rb.example.development +++ b/config/unicorn.rb.example.development @@ -7,7 +7,7 @@ check_client_connection false before_fork do |server, worker| # the following is highly recommended for Rails + "preload_app true" # as there's no need for the master process to hold a connection - defined?(ActiveRecord::Base) and + defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect! if /darwin/ =~ RUBY_PLATFORM @@ -27,6 +27,6 @@ after_fork do |server, worker| require 'rbtrace' if ENV['ENABLE_RBTRACE'] # the following is *required* for Rails + "preload_app true", - defined?(ActiveRecord::Base) and + defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection end |