summaryrefslogtreecommitdiff
path: root/config/unicorn.rb.example
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2018-10-12 14:08:13 -0500
committerBrett Walker <bwalker@gitlab.com>2018-10-12 14:08:13 -0500
commitf48039933435f32a0f7aeb24a491cb5ba12eb516 (patch)
tree92633ec27ed7abe2abce831967a9653659fc1c84 /config/unicorn.rb.example
parent1103f589f0a77bf11ca3103165fb287a6d092eb5 (diff)
downloadgitlab-ce-f48039933435f32a0f7aeb24a491cb5ba12eb516.tar.gz
Fix rubocop complaining about unicorn.rb
Diffstat (limited to 'config/unicorn.rb.example')
-rw-r--r--config/unicorn.rb.example4
1 files changed, 2 insertions, 2 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