summaryrefslogtreecommitdiff
path: root/config/initializers/7_prometheus_metrics.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-30 09:27:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-30 09:27:58 +0000
commitb539ac1d619c0aafe5988ab8b125a8b43b14d87f (patch)
treebe1924f2d30fb714e4efd7ffb486f25fa271cb55 /config/initializers/7_prometheus_metrics.rb
parent4c016ad02422709d3a341215952a9b1cdb4a8451 (diff)
downloadgitlab-ce-b539ac1d619c0aafe5988ab8b125a8b43b14d87f.tar.gz
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.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index 974eff1a528..5d444b19a45 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -70,8 +70,8 @@ if defined?(::Unicorn) || defined?(::Puma)
Gitlab::Metrics::Exporter::WebExporter.instance.start
end
- Gitlab::Cluster::LifecycleEvents.on_before_phased_restart do
- # We need to ensure that before we re-exec server
+ Gitlab::Cluster::LifecycleEvents.on_before_graceful_shutdown do
+ # We need to ensure that before we re-exec or shutdown server
# we do stop the exporter
Gitlab::Metrics::Exporter::WebExporter.instance.stop
end