diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 06:07:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 06:07:45 +0300 |
commit | 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (patch) | |
tree | b27794ba1a039cdc42cdf5d90bcb7b7503437324 /config/initializers/7_prometheus_metrics.rb | |
parent | 7480d774dfca97ea905321d52c70fd19496f0084 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/7_prometheus_metrics.rb')
-rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index d14dc071b7b..c14ee1458bc 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -4,11 +4,11 @@ require 'prometheus/client' def prometheus_default_multiproc_dir return unless Rails.env.development? || Rails.env.test? - if Gitlab::Runtime.sidekiq? + if Sidekiq.server? Rails.root.join('tmp/prometheus_multiproc_dir/sidekiq') - elsif Gitlab::Runtime.unicorn? + elsif defined?(Unicorn::Worker) Rails.root.join('tmp/prometheus_multiproc_dir/unicorn') - elsif Gitlab::Runtime.puma? + elsif defined?(::Puma) Rails.root.join('tmp/prometheus_multiproc_dir/puma') else Rails.root.join('tmp/prometheus_multiproc_dir') @@ -48,9 +48,9 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? Gitlab::Cluster::LifecycleEvents.on_master_start do ::Prometheus::Client.reinitialize_on_pid_change(force: true) - if Gitlab::Runtime.unicorn? + if defined?(::Unicorn) Gitlab::Metrics::Samplers::UnicornSampler.instance(Settings.monitoring.unicorn_sampler_interval).start - elsif Gitlab::Runtime.puma? + elsif defined?(::Puma) Gitlab::Metrics::Samplers::PumaSampler.instance(Settings.monitoring.puma_sampler_interval).start end @@ -58,7 +58,7 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? end end -if Gitlab::Runtime.app_server? +if defined?(::Unicorn) || defined?(::Puma) Gitlab::Cluster::LifecycleEvents.on_master_start do Gitlab::Metrics::Exporter::WebExporter.instance.start end |