summaryrefslogtreecommitdiff
path: root/lib/gitlab/cluster
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-17 03:07:45 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-17 03:07:45 +0000
commit9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (patch)
treeb27794ba1a039cdc42cdf5d90bcb7b7503437324 /lib/gitlab/cluster
parent7480d774dfca97ea905321d52c70fd19496f0084 (diff)
downloadgitlab-ce-9763c081708e4c2e08de1f4e9ca9abdef5cffe3c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/cluster')
-rw-r--r--lib/gitlab/cluster/lifecycle_events.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/cluster/lifecycle_events.rb b/lib/gitlab/cluster/lifecycle_events.rb
index 4ae75e0db0a..2b3dc94fc5e 100644
--- a/lib/gitlab/cluster/lifecycle_events.rb
+++ b/lib/gitlab/cluster/lifecycle_events.rb
@@ -149,10 +149,10 @@ module Gitlab
def in_clustered_environment?
# Sidekiq doesn't fork
- return false if Gitlab::Runtime.sidekiq?
+ return false if Sidekiq.server?
# Unicorn always forks
- return true if Gitlab::Runtime.unicorn?
+ return true if defined?(::Unicorn)
# Puma sometimes forks
return true if in_clustered_puma?
@@ -162,7 +162,7 @@ module Gitlab
end
def in_clustered_puma?
- return false unless Gitlab::Runtime.puma?
+ return false unless defined?(::Puma)
@puma_options && @puma_options[:workers] && @puma_options[:workers] > 0
end