Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-22 12:07:51 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-22 12:07:51 +0300
commit3ad11f24ca52d42694a8ce920a87ead6085d3f85 (patch)
treed5b664aafa7c2b65f470a700431d336d908c0ebc /lib/prometheus
parent62fcb9ffa9e40db6f34e7dd0d36804d73ef01435 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/prometheus')
-rw-r--r--lib/prometheus/pid_provider.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/prometheus/pid_provider.rb b/lib/prometheus/pid_provider.rb
index 228639357ac..32beeb0d31e 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 Sidekiq.server?
+ if Gitlab::Runtime.sidekiq?
sidekiq_worker_id
- elsif defined?(Unicorn::Worker)
+ elsif Gitlab::Runtime.unicorn?
unicorn_worker_id
- elsif defined?(::Puma)
+ elsif Gitlab::Runtime.puma?
puma_worker_id
else
unknown_process_id