diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-10 13:52:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-10 13:52:59 +0300 |
| commit | cec843b2ec7535618674fc1cd00061e9d4a95b37 (patch) | |
| tree | aa288ced5ece74208df396e6386b2fd51c641c96 /config | |
| parent | 2dd5a5179a522b650425610cc76954e433b61c09 (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index a304f861db8..a010417bdc4 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -44,9 +44,6 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? # When running Puma in a Single mode, `on_master_start` and `on_worker_start` are the same. # Thus, we order these events to run `reinitialize_on_pid_change` with `force: true` first. Gitlab::Cluster::LifecycleEvents.on_master_start do - # Ensure that stale Prometheus metrics don't accumulate over time - Prometheus::CleanupMultiprocDirService.new.execute - ::Prometheus::Client.reinitialize_on_pid_change(force: true) if Gitlab::Runtime.unicorn? |