1 files changed, 13 insertions, 15 deletions
diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index 4417bb722..57efd5820 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -5,13 +5,15 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
+using Jellyfin.Api.Middleware;
 using Jellyfin.MediaEncoding.Hls.Extensions;
 using Jellyfin.Networking.Configuration;
 using Jellyfin.Networking.HappyEyeballs;
 using Jellyfin.Server.Extensions;
+using Jellyfin.Server.HealthChecks;
 using Jellyfin.Server.Implementations;
+using Jellyfin.Server.Implementations.Extensions;
 using Jellyfin.Server.Infrastructure;
-using Jellyfin.Server.Middleware;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
@@ -35,20 +37,17 @@ namespace Jellyfin.Server
     /// </summary>
     public class Startup
     {
-        private readonly IServerConfigurationManager _serverConfigurationManager;
         private readonly IServerApplicationHost _serverApplicationHost;
+        private readonly IServerConfigurationManager _serverConfigurationManager;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Startup" /> class.
         /// </summary>
-        /// <param name="serverConfigurationManager">The server configuration manager.</param>
-        /// <param name="serverApplicationHost">The server application host.</param>
-        public Startup(
-            IServerConfigurationManager serverConfigurationManager,
-            IServerApplicationHost serverApplicationHost)
+        /// <param name="appHost">The server application host.</param>
+        public Startup(CoreAppHost appHost)
         {
-            _serverConfigurationManager = serverConfigurationManager;
-            _serverApplicationHost = serverApplicationHost;
+            _serverApplicationHost = appHost;
+            _serverConfigurationManager = appHost.ConfigurationManager;
         }
 
         /// <summary>
@@ -67,7 +66,7 @@ namespace Jellyfin.Server
             // TODO remove once this is fixed upstream https://github.com/dotnet/aspnetcore/issues/34371
             services.AddSingleton<IActionResultExecutor<PhysicalFileResult>, SymlinkFollowingPhysicalFileResultExecutor>();
             services.AddJellyfinApi(_serverApplicationHost.GetApiPluginAssemblies(), _serverConfigurationManager.GetNetworkConfiguration());
-
+            services.AddJellyfinDbContext();
             services.AddJellyfinApiSwagger();
 
             // configure custom legacy authentication
@@ -94,8 +93,7 @@ namespace Jellyfin.Server
                 RequestHeaderEncodingSelector = (_, _) => Encoding.UTF8
             };
 
-            services
-                .AddHttpClient(NamedClient.Default, c =>
+            services.AddHttpClient(NamedClient.Default, c =>
                 {
                     c.DefaultRequestHeaders.UserAgent.Add(productHeader);
                     c.DefaultRequestHeaders.Accept.Add(acceptJsonHeader);
@@ -128,7 +126,7 @@ namespace Jellyfin.Server
                         string.Format(
                             CultureInfo.InvariantCulture,
                             "{0}/{1} UPnP/1.0 {2}/{3}",
-                            MediaBrowser.Common.System.OperatingSystem.Name,
+                            Environment.OSVersion.Platform,
                             Environment.OSVersion,
                             _serverApplicationHost.Name,
                             _serverApplicationHost.ApplicationVersionString));
@@ -139,7 +137,7 @@ namespace Jellyfin.Server
                 .ConfigurePrimaryHttpMessageHandler(defaultHttpClientHandlerDelegate);
 
             services.AddHealthChecks()
-                .AddDbContextCheck<JellyfinDb>();
+                .AddCheck<DbContextFactoryHealthCheck<JellyfinDbContext>>(nameof(JellyfinDbContext));
 
             services.AddHlsPlaylistGenerator();
         }
@@ -224,7 +222,7 @@ namespace Jellyfin.Server
                     endpoints.MapControllers();
                     if (_serverConfigurationManager.Configuration.EnableMetrics)
                     {
-                        endpoints.MapMetrics("/metrics");
+                        endpoints.MapMetrics();
                     }
 
                     endpoints.MapHealthChecks("/health");