From e5ecdcf8c99f16928b18cb4c0fcc77e1c08b2637 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Mon, 13 May 2024 12:47:31 -0400
Subject: [PATCH] Backport pull request #11539 from jellyfin/release-10.9.z

Add metrics collector to disposable parts

Original-merge: c1907354e889011175446439a34b21d4ad260964

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 Jellyfin.Server/Program.cs                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 6add7e0b39..c394b25bd5 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -422,7 +422,7 @@ namespace Emby.Server.Implementations
             // Initialize runtime stat collection
             if (ConfigurationManager.Configuration.EnableMetrics)
             {
-                DotNetRuntimeStatsBuilder.Default().StartCollecting();
+                _disposableParts.Add(DotNetRuntimeStatsBuilder.Default().StartCollecting());
             }
 
             var networkConfiguration = ConfigurationManager.GetNetworkConfiguration();
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index fd76969062..295fb8112f 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -185,6 +185,7 @@ namespace Jellyfin.Server
             }
             catch (Exception ex)
             {
+                _restartOnShutdown = false;
                 _logger.LogCritical(ex, "Error while starting server");
             }
             finally