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
path: root/config
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-12-07 20:45:08 +0300
committerStan Hu <stanhu@gmail.com>2017-12-07 20:45:08 +0300
commitaa24f7e1abac167189a76590dbaccd5b53726507 (patch)
tree86bc7205981bcc4e52072a7db49d91bdc34ac2ea /config
parent989d3148e1a274fb6baf1d90f28dcfaa331a57b0 (diff)
parentee22a47d629fb13a52100921761f833acd80dbd9 (diff)
Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master'
Update prometheus-client-mmap gem to highly optimized version See merge request gitlab-org/gitlab-ce!15796
Diffstat (limited to 'config')
-rw-r--r--config/initializers/7_prometheus_metrics.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index 43b1e943897..eb7959e4da6 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -11,14 +11,7 @@ Prometheus::Client.configure do |config|
config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir')
end
- config.pid_provider = -> do
- worker_id = Prometheus::Client::Support::Unicorn.worker_id
- if worker_id.nil?
- "process_pid_#{Process.pid}"
- else
- "worker_id_#{worker_id}"
- end
- end
+ config.pid_provider = Prometheus::Client::Support::Unicorn.method(:worker_pid_provider)
end
Gitlab::Application.configure do |config|