Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-04 14:14:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

renaming of jfHost

Browse Source 
usings cleanup
This commit is contained in:
JPVenson 2025-02-21 11:05:47 +00:00
parent a05b3be1b3
commit 7735aafef5
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Jellyfin.Server/Program.cs
View File

@ -7,7 +7,6 @@ using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommandLine; using CommandLine;
using Emby.Server.Implementations; using Emby.Server.Implementations;
using Jellyfin.Networking.Manager;
using Jellyfin.Server.Extensions; using Jellyfin.Server.Extensions;
using Jellyfin.Server.Helpers; using Jellyfin.Server.Helpers;
using Jellyfin.Server.Implementations; using Jellyfin.Server.Implementations;
@ -47,7 +46,7 @@ namespace Jellyfin.Server
private static readonly SerilogLoggerFactory _loggerFactory = new SerilogLoggerFactory(); private static readonly SerilogLoggerFactory _loggerFactory = new SerilogLoggerFactory();
private static SetupServer _setupServer = new(); private static SetupServer _setupServer = new();
private static CoreAppHost? _appHost; private static CoreAppHost? _appHost;
private static IHost? _jfHost = null; private static IHost? _jellyfinHost = null;
private static long _startTimestamp; private static long _startTimestamp;
private static ILogger _logger = NullLogger.Instance; private static ILogger _logger = NullLogger.Instance;
private static bool _restartOnShutdown; private static bool _restartOnShutdown;
@ -74,7 +73,7 @@ namespace Jellyfin.Server
{ {
_startTimestamp = Stopwatch.GetTimestamp(); _startTimestamp = Stopwatch.GetTimestamp();
ServerApplicationPaths appPaths = StartupHelpers.CreateApplicationPaths(options); ServerApplicationPaths appPaths = StartupHelpers.CreateApplicationPaths(options);
await _setupServer.RunAsync(static () => _jfHost?.Services?.GetService<INetworkManager>(), appPaths, static () => _appHost).ConfigureAwait(false); await _setupServer.RunAsync(static () => _jellyfinHost?.Services?.GetService<INetworkManager>(), appPaths, static () => _appHost).ConfigureAwait(false);
// $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager // $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager
Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath); Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath);
@ -130,7 +129,7 @@ namespace Jellyfin.Server
{ {
_startTimestamp = Stopwatch.GetTimestamp(); _startTimestamp = Stopwatch.GetTimestamp();
_setupServer = new SetupServer(); _setupServer = new SetupServer();
await _setupServer.RunAsync(static () => _jfHost?.Services?.GetService<INetworkManager>(), appPaths, static () => _appHost).ConfigureAwait(false); await _setupServer.RunAsync(static () => _jellyfinHost?.Services?.GetService<INetworkManager>(), appPaths, static () => _appHost).ConfigureAwait(false);
} }
} while (_restartOnShutdown); } while (_restartOnShutdown);
} }
@ -145,7 +144,7 @@ namespace Jellyfin.Server
_appHost = appHost; _appHost = appHost;
try try
{ {
_jfHost = Host.CreateDefaultBuilder() _jellyfinHost = Host.CreateDefaultBuilder()
.UseConsoleLifetime() .UseConsoleLifetime()
.ConfigureServices(services => appHost.Init(services)) .ConfigureServices(services => appHost.Init(services))
.ConfigureWebHostDefaults(webHostBuilder => .ConfigureWebHostDefaults(webHostBuilder =>
@ -162,7 +161,7 @@ namespace Jellyfin.Server
.Build(); .Build();
// Re-use the host service provider in the app host since ASP.NET doesn't allow a custom service collection. // Re-use the host service provider in the app host since ASP.NET doesn't allow a custom service collection.
appHost.ServiceProvider = _jfHost.Services; appHost.ServiceProvider = _jellyfinHost.Services;
await appHost.InitializeServices().ConfigureAwait(false); await appHost.InitializeServices().ConfigureAwait(false);
Migrations.MigrationRunner.Run(appHost, _loggerFactory); Migrations.MigrationRunner.Run(appHost, _loggerFactory);
@ -172,7 +171,7 @@ namespace Jellyfin.Server
await _setupServer.StopAsync().ConfigureAwait(false); await _setupServer.StopAsync().ConfigureAwait(false);
_setupServer.Dispose(); _setupServer.Dispose();
_setupServer = null!; _setupServer = null!;
await _jfHost.StartAsync().ConfigureAwait(false); await _jellyfinHost.StartAsync().ConfigureAwait(false);
if (!OperatingSystem.IsWindows() && startupConfig.UseUnixSocket()) if (!OperatingSystem.IsWindows() && startupConfig.UseUnixSocket())
{ {
@ -191,7 +190,7 @@ namespace Jellyfin.Server
_logger.LogInformation("Startup complete {Time:g}", Stopwatch.GetElapsedTime(_startTimestamp)); _logger.LogInformation("Startup complete {Time:g}", Stopwatch.GetElapsedTime(_startTimestamp));
await _jfHost.WaitForShutdownAsync().ConfigureAwait(false); await _jellyfinHost.WaitForShutdownAsync().ConfigureAwait(false);
_restartOnShutdown = appHost.ShouldRestart; _restartOnShutdown = appHost.ShouldRestart;
} }
catch (Exception ex) catch (Exception ex)
@ -217,7 +216,7 @@ namespace Jellyfin.Server
} }
_appHost = null; _appHost = null;
_jfHost?.Dispose(); _jellyfinHost?.Dispose();
} }
} }

3
Jellyfin.Server/ServerSetupApp/SetupServer.cs
View File

@ -4,19 +4,16 @@ using System.Linq;
using System.Net; using System.Net;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Jellyfin.Networking.Manager;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using MediaBrowser.Controller; using MediaBrowser.Controller;
using MediaBrowser.Model.System; using MediaBrowser.Model.System;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using SQLitePCL;
namespace Jellyfin.Server.ServerSetupApp; namespace Jellyfin.Server.ServerSetupApp;