diff options
| author | crobibero <cody@robibe.ro> | 2024-05-13 12:47:31 -0400 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2024-05-13 12:47:31 -0400 |
| commit | e5ecdcf8c99f16928b18cb4c0fcc77e1c08b2637 (patch) | |
| tree | 536d3d3176a7fa5b3c87df35ddf0115266c1c734 | |
| parent | 1e0c7f05e6252eb068c2970c90dced9243db7868 (diff) | |
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>
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 2 | ||||
| -rw-r--r-- | Jellyfin.Server/Program.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 6add7e0b3..c394b25bd 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 fd7696906..295fb8112 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 |