diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/prometheus/pid_provider.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/prometheus/pid_provider.rb')
-rw-r--r-- | lib/prometheus/pid_provider.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/prometheus/pid_provider.rb b/lib/prometheus/pid_provider.rb index 32beeb0d31e..d2563b4c806 100644 --- a/lib/prometheus/pid_provider.rb +++ b/lib/prometheus/pid_provider.rb @@ -7,8 +7,6 @@ module Prometheus def worker_id if Gitlab::Runtime.sidekiq? sidekiq_worker_id - elsif Gitlab::Runtime.unicorn? - unicorn_worker_id elsif Gitlab::Runtime.puma? puma_worker_id else @@ -26,16 +24,6 @@ module Prometheus end end - def unicorn_worker_id - if matches = process_name.match(/unicorn.*worker\[([0-9]+)\]/) - "unicorn_#{matches[1]}" - elsif process_name =~ /unicorn/ - "unicorn_master" - else - unknown_process_id - end - end - def puma_worker_id if matches = process_name.match(/puma.*cluster worker ([0-9]+):/) "puma_#{matches[1]}" |