summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-08-12 16:20:31 +0000
committerStan Hu <stanhu@gmail.com>2019-08-12 16:20:31 +0000
commit5971cd15086f65fa7202b05b26fc2f980b9f2767 (patch)
tree65d28e7772ba68386d2ecf4d3a3b2c7ef79f8a58 /lib
parent7a22b4bae55ba3afcc6fc961e6a0aeb47c7bd937 (diff)
parent35fb27db277be62dde1f5c58709fd6af59c144a9 (diff)
downloadgitlab-ce-5971cd15086f65fa7202b05b26fc2f980b9f2767.tar.gz
Merge branch '65278-fix-puma-master-counter-wipe' into 'master'
Fix active metric files being wiped after the app starts See merge request gitlab-org/gitlab-ce!31668
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/cluster/puma_worker_killer_observer.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/cluster/puma_worker_killer_observer.rb b/lib/gitlab/cluster/puma_worker_killer_observer.rb
index 3b4ebc3fbae..f53051c32ff 100644
--- a/lib/gitlab/cluster/puma_worker_killer_observer.rb
+++ b/lib/gitlab/cluster/puma_worker_killer_observer.rb
@@ -15,9 +15,7 @@ module Gitlab
private
def log_termination(worker)
- labels = { worker: "worker_#{worker.index}" }
-
- @counter.increment(labels)
+ @counter.increment
end
end
end