diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 03:07:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 03:07:45 +0000 |
commit | 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (patch) | |
tree | b27794ba1a039cdc42cdf5d90bcb7b7503437324 /lib/prometheus | |
parent | 7480d774dfca97ea905321d52c70fd19496f0084 (diff) | |
download | gitlab-ce-9763c081708e4c2e08de1f4e9ca9abdef5cffe3c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/prometheus')
-rw-r--r-- | lib/prometheus/pid_provider.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/prometheus/pid_provider.rb b/lib/prometheus/pid_provider.rb index 32beeb0d31e..228639357ac 100644 --- a/lib/prometheus/pid_provider.rb +++ b/lib/prometheus/pid_provider.rb @@ -5,11 +5,11 @@ module Prometheus extend self def worker_id - if Gitlab::Runtime.sidekiq? + if Sidekiq.server? sidekiq_worker_id - elsif Gitlab::Runtime.unicorn? + elsif defined?(Unicorn::Worker) unicorn_worker_id - elsif Gitlab::Runtime.puma? + elsif defined?(::Puma) puma_worker_id else unknown_process_id |