1 files changed, 6 insertions, 0 deletions
diff --git a/metrics_server/metrics_server.rb b/metrics_server/metrics_server.rb
index 873489b444e..f504d075498 100644
--- a/metrics_server/metrics_server.rb
+++ b/metrics_server/metrics_server.rb
@@ -17,6 +17,12 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass
       end
 
       supervisor = PumaProcessSupervisor.instance
+
+      at_exit do
+        Gitlab::AppLogger.info("Puma process #{Process.pid} is exiting, shutting down metrics server...")
+        supervisor.shutdown
+      end
+
       supervisor.supervise(start_server.call) do
         Gitlab::AppLogger.info('Puma metrics server terminated, restarting...')
         start_server.call