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:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-28 01:40:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-28 01:40:43 +0300
commitbbe511b231b5de3fab4dc418601c89cc1ccc8063 (patch)
tree650453c3b64751df39fda6f33ca4b39318f41e0d /config
parentad1c34c03de42ebc5279f338f6304e77930d34d4 (diff)
Add latest changes from gitlab-org/gitlab@14-1-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/initializers/7_prometheus_metrics.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index fc69ae7b077..d2d546a5438 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -40,9 +40,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.puma?