diff --git a/Jellyfin.Server/Helpers/StartupHelpers.cs b/Jellyfin.Server/Helpers/StartupHelpers.cs
new file mode 100644
index 0000000000..b10e34898c
--- /dev/null
+++ b/Jellyfin.Server/Helpers/StartupHelpers.cs
@@ -0,0 +1,276 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Emby.Server.Implementations;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.IO;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+using SQLitePCL;
+
+namespace Jellyfin.Server.Helpers;
+
+///
+/// A class containing helper methods for server startup.
+///
+public static class StartupHelpers
+{
+ ///
+ /// Create the data, config and log paths from the variety of inputs(command line args,
+ /// environment variables) or decide on what default to use. For Windows it's %AppPath%
+ /// for everything else the
+ /// XDG approach
+ /// is followed.
+ ///
+ /// The for this instance.
+ /// .
+ public static ServerApplicationPaths CreateApplicationPaths(StartupOptions options)
+ {
+ // dataDir
+ // IF --datadir
+ // ELSE IF $JELLYFIN_DATA_DIR
+ // ELSE IF windows, use <%APPDATA%>/jellyfin
+ // ELSE IF $XDG_DATA_HOME then use $XDG_DATA_HOME/jellyfin
+ // ELSE use $HOME/.local/share/jellyfin
+ var dataDir = options.DataDir;
+ if (string.IsNullOrEmpty(dataDir))
+ {
+ dataDir = Environment.GetEnvironmentVariable("JELLYFIN_DATA_DIR");
+
+ if (string.IsNullOrEmpty(dataDir))
+ {
+ // LocalApplicationData follows the XDG spec on unix machines
+ dataDir = Path.Combine(
+ Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+ "jellyfin");
+ }
+ }
+
+ // configDir
+ // IF --configdir
+ // ELSE IF $JELLYFIN_CONFIG_DIR
+ // ELSE IF --datadir, use /config (assume portable run)
+ // ELSE IF /config exists, use that
+ // ELSE IF windows, use /config
+ // ELSE IF $XDG_CONFIG_HOME use $XDG_CONFIG_HOME/jellyfin
+ // ELSE $HOME/.config/jellyfin
+ var configDir = options.ConfigDir;
+ if (string.IsNullOrEmpty(configDir))
+ {
+ configDir = Environment.GetEnvironmentVariable("JELLYFIN_CONFIG_DIR");
+
+ if (string.IsNullOrEmpty(configDir))
+ {
+ if (options.DataDir is not null
+ || Directory.Exists(Path.Combine(dataDir, "config"))
+ || OperatingSystem.IsWindows())
+ {
+ // Hang config folder off already set dataDir
+ configDir = Path.Combine(dataDir, "config");
+ }
+ else
+ {
+ // $XDG_CONFIG_HOME defines the base directory relative to which
+ // user specific configuration files should be stored.
+ configDir = Environment.GetEnvironmentVariable("XDG_CONFIG_HOME");
+
+ // If $XDG_CONFIG_HOME is either not set or empty,
+ // a default equal to $HOME /.config should be used.
+ if (string.IsNullOrEmpty(configDir))
+ {
+ configDir = Path.Combine(
+ Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+ ".config");
+ }
+
+ configDir = Path.Combine(configDir, "jellyfin");
+ }
+ }
+ }
+
+ // cacheDir
+ // IF --cachedir
+ // ELSE IF $JELLYFIN_CACHE_DIR
+ // ELSE IF windows, use /cache
+ // ELSE IF XDG_CACHE_HOME, use $XDG_CACHE_HOME/jellyfin
+ // ELSE HOME/.cache/jellyfin
+ var cacheDir = options.CacheDir;
+ if (string.IsNullOrEmpty(cacheDir))
+ {
+ cacheDir = Environment.GetEnvironmentVariable("JELLYFIN_CACHE_DIR");
+
+ if (string.IsNullOrEmpty(cacheDir))
+ {
+ if (OperatingSystem.IsWindows())
+ {
+ // Hang cache folder off already set dataDir
+ cacheDir = Path.Combine(dataDir, "cache");
+ }
+ else
+ {
+ // $XDG_CACHE_HOME defines the base directory relative to which
+ // user specific non-essential data files should be stored.
+ cacheDir = Environment.GetEnvironmentVariable("XDG_CACHE_HOME");
+
+ // If $XDG_CACHE_HOME is either not set or empty,
+ // a default equal to $HOME/.cache should be used.
+ if (string.IsNullOrEmpty(cacheDir))
+ {
+ cacheDir = Path.Combine(
+ Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+ ".cache");
+ }
+
+ cacheDir = Path.Combine(cacheDir, "jellyfin");
+ }
+ }
+ }
+
+ // webDir
+ // IF --webdir
+ // ELSE IF $JELLYFIN_WEB_DIR
+ // ELSE /jellyfin-web
+ var webDir = options.WebDir;
+ if (string.IsNullOrEmpty(webDir))
+ {
+ webDir = Environment.GetEnvironmentVariable("JELLYFIN_WEB_DIR");
+
+ if (string.IsNullOrEmpty(webDir))
+ {
+ // Use default location under ResourcesPath
+ webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web");
+ }
+ }
+
+ // logDir
+ // IF --logdir
+ // ELSE IF $JELLYFIN_LOG_DIR
+ // ELSE IF --datadir, use /log (assume portable run)
+ // ELSE /log
+ var logDir = options.LogDir;
+ if (string.IsNullOrEmpty(logDir))
+ {
+ logDir = Environment.GetEnvironmentVariable("JELLYFIN_LOG_DIR");
+
+ if (string.IsNullOrEmpty(logDir))
+ {
+ // Hang log folder off already set dataDir
+ logDir = Path.Combine(dataDir, "log");
+ }
+ }
+
+ // Normalize paths. Only possible with GetFullPath for now - https://github.com/dotnet/runtime/issues/2162
+ dataDir = Path.GetFullPath(dataDir);
+ logDir = Path.GetFullPath(logDir);
+ configDir = Path.GetFullPath(configDir);
+ cacheDir = Path.GetFullPath(cacheDir);
+ webDir = Path.GetFullPath(webDir);
+
+ // Ensure the main folders exist before we continue
+ try
+ {
+ Directory.CreateDirectory(dataDir);
+ Directory.CreateDirectory(logDir);
+ Directory.CreateDirectory(configDir);
+ Directory.CreateDirectory(cacheDir);
+ }
+ catch (IOException ex)
+ {
+ Console.Error.WriteLine("Error whilst attempting to create folder");
+ Console.Error.WriteLine(ex.ToString());
+ Environment.Exit(1);
+ }
+
+ return new ServerApplicationPaths(dataDir, logDir, configDir, cacheDir, webDir);
+ }
+
+ ///
+ /// Initialize the logging configuration file using the bundled resource file as a default if it doesn't exist
+ /// already.
+ ///
+ /// The application paths.
+ /// A task representing the creation of the configuration file, or a completed task if the file already exists.
+ public static async Task InitLoggingConfigFile(IApplicationPaths appPaths)
+ {
+ // Do nothing if the config file already exists
+ string configPath = Path.Combine(appPaths.ConfigurationDirectoryPath, Program.LoggingConfigFileDefault);
+ if (File.Exists(configPath))
+ {
+ return;
+ }
+
+ // Get a stream of the resource contents
+ // NOTE: The .csproj name is used instead of the assembly name in the resource path
+ const string ResourcePath = "Jellyfin.Server.Resources.Configuration.logging.json";
+ Stream resource = typeof(Program).Assembly.GetManifestResourceStream(ResourcePath)
+ ?? throw new InvalidOperationException($"Invalid resource path: '{ResourcePath}'");
+ await using (resource.ConfigureAwait(false))
+ {
+ Stream dst = new FileStream(configPath, FileMode.CreateNew, FileAccess.Write, FileShare.None, IODefaults.FileStreamBufferSize, FileOptions.Asynchronous);
+ await using (dst.ConfigureAwait(false))
+ {
+ // Copy the resource contents to the expected file path for the config file
+ await resource.CopyToAsync(dst).ConfigureAwait(false);
+ }
+ }
+ }
+
+ ///
+ /// Initialize Serilog using configuration and fall back to defaults on failure.
+ ///
+ /// The configuration object.
+ /// The application paths.
+ public static void InitializeLoggingFramework(IConfiguration configuration, IApplicationPaths appPaths)
+ {
+ try
+ {
+ // Serilog.Log is used by SerilogLoggerFactory when no logger is specified
+ Log.Logger = new LoggerConfiguration()
+ .ReadFrom.Configuration(configuration)
+ .Enrich.FromLogContext()
+ .Enrich.WithThreadId()
+ .CreateLogger();
+ }
+ catch (Exception ex)
+ {
+ Log.Logger = new LoggerConfiguration()
+ .WriteTo.Console(
+ outputTemplate: "[{Timestamp:HH:mm:ss}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message:lj}{NewLine}{Exception}",
+ formatProvider: CultureInfo.InvariantCulture)
+ .WriteTo.Async(x => x.File(
+ Path.Combine(appPaths.LogDirectoryPath, "log_.log"),
+ rollingInterval: RollingInterval.Day,
+ outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message}{NewLine}{Exception}",
+ formatProvider: CultureInfo.InvariantCulture,
+ encoding: Encoding.UTF8))
+ .Enrich.FromLogContext()
+ .Enrich.WithThreadId()
+ .CreateLogger();
+
+ Log.Logger.Fatal(ex, "Failed to create/read logger configuration");
+ }
+ }
+
+ ///
+ /// Call static initialization methods for the application.
+ ///
+ public static void PerformStaticInitialization()
+ {
+ // Make sure we have all the code pages we can get
+ // Ref: https://docs.microsoft.com/en-us/dotnet/api/system.text.codepagesencodingprovider.instance?view=netcore-3.0#remarks
+ Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
+ // Increase the max http request limit
+ // The default connection limit is 10 for ASP.NET hosted applications and 2 for all others.
+ ServicePointManager.DefaultConnectionLimit = Math.Max(96, ServicePointManager.DefaultConnectionLimit);
+
+ // Disable the "Expect: 100-Continue" header by default
+ // http://stackoverflow.com/questions/566437/http-post-returns-the-error-417-expectation-failed-c
+ ServicePointManager.Expect100Continue = false;
+
+ Batteries_V2.Init();
+ }
+}
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 540375dce6..f6fa0ff5ba 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -1,21 +1,19 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.Globalization;
using System.IO;
using System.Linq;
using System.Net;
using System.Reflection;
using System.Runtime.Versioning;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
using CommandLine;
using Emby.Server.Implementations;
+using Jellyfin.Server.Helpers;
using Jellyfin.Server.Implementations;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
-using MediaBrowser.Model.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
@@ -25,7 +23,6 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Serilog;
using Serilog.Extensions.Logging;
-using SQLitePCL;
using static MediaBrowser.Controller.Extensions.ConfigurationExtensions;
using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -99,7 +96,7 @@ namespace Jellyfin.Server
Console.Error.WriteLine("Unhandled Exception\n" + e.ExceptionObject.ToString());
AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionToConsole;
- ServerApplicationPaths appPaths = CreateApplicationPaths(options);
+ ServerApplicationPaths appPaths = StartupHelpers.CreateApplicationPaths(options);
// $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager
Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath);
@@ -108,13 +105,12 @@ namespace Jellyfin.Server
Environment.SetEnvironmentVariable("NEOReadDebugKeys", "1");
Environment.SetEnvironmentVariable("EnableExtendedVaFormats", "1");
- await InitLoggingConfigFile(appPaths).ConfigureAwait(false);
+ await StartupHelpers.InitLoggingConfigFile(appPaths).ConfigureAwait(false);
// Create an instance of the application configuration to use for application startup
IConfiguration startupConfig = CreateAppConfiguration(options, appPaths);
- // Initialize logging framework
- InitializeLoggingFramework(startupConfig, appPaths);
+ StartupHelpers.InitializeLoggingFramework(startupConfig, appPaths);
_logger = _loggerFactory.CreateLogger("Main");
// Log uncaught exceptions to the logging instead of std error
@@ -173,7 +169,7 @@ namespace Jellyfin.Server
}
}
- PerformStaticInitialization();
+ StartupHelpers.PerformStaticInitialization();
Migrations.MigrationRunner.RunPreStartup(appPaths, _loggerFactory);
var appHost = new CoreAppHost(
@@ -255,26 +251,6 @@ namespace Jellyfin.Server
}
}
- ///
- /// Call static initialization methods for the application.
- ///
- public static void PerformStaticInitialization()
- {
- // Make sure we have all the code pages we can get
- // Ref: https://docs.microsoft.com/en-us/dotnet/api/system.text.codepagesencodingprovider.instance?view=netcore-3.0#remarks
- Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-
- // Increase the max http request limit
- // The default connection limit is 10 for ASP.NET hosted applications and 2 for all others.
- ServicePointManager.DefaultConnectionLimit = Math.Max(96, ServicePointManager.DefaultConnectionLimit);
-
- // Disable the "Expect: 100-Continue" header by default
- // http://stackoverflow.com/questions/566437/http-post-returns-the-error-417-expectation-failed-c
- ServicePointManager.Expect100Continue = false;
-
- Batteries_V2.Init();
- }
-
///
/// Configure the web host builder.
///
@@ -344,206 +320,6 @@ namespace Jellyfin.Server
.UseStartup(_ => new Startup(appHost));
}
- ///
- /// Create the data, config and log paths from the variety of inputs(command line args,
- /// environment variables) or decide on what default to use. For Windows it's %AppPath%
- /// for everything else the
- /// XDG approach
- /// is followed.
- ///
- /// The for this instance.
- /// .
- private static ServerApplicationPaths CreateApplicationPaths(StartupOptions options)
- {
- // dataDir
- // IF --datadir
- // ELSE IF $JELLYFIN_DATA_DIR
- // ELSE IF windows, use <%APPDATA%>/jellyfin
- // ELSE IF $XDG_DATA_HOME then use $XDG_DATA_HOME/jellyfin
- // ELSE use $HOME/.local/share/jellyfin
- var dataDir = options.DataDir;
- if (string.IsNullOrEmpty(dataDir))
- {
- dataDir = Environment.GetEnvironmentVariable("JELLYFIN_DATA_DIR");
-
- if (string.IsNullOrEmpty(dataDir))
- {
- // LocalApplicationData follows the XDG spec on unix machines
- dataDir = Path.Combine(
- Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
- "jellyfin");
- }
- }
-
- // configDir
- // IF --configdir
- // ELSE IF $JELLYFIN_CONFIG_DIR
- // ELSE IF --datadir, use /config (assume portable run)
- // ELSE IF /config exists, use that
- // ELSE IF windows, use /config
- // ELSE IF $XDG_CONFIG_HOME use $XDG_CONFIG_HOME/jellyfin
- // ELSE $HOME/.config/jellyfin
- var configDir = options.ConfigDir;
- if (string.IsNullOrEmpty(configDir))
- {
- configDir = Environment.GetEnvironmentVariable("JELLYFIN_CONFIG_DIR");
-
- if (string.IsNullOrEmpty(configDir))
- {
- if (options.DataDir is not null
- || Directory.Exists(Path.Combine(dataDir, "config"))
- || OperatingSystem.IsWindows())
- {
- // Hang config folder off already set dataDir
- configDir = Path.Combine(dataDir, "config");
- }
- else
- {
- // $XDG_CONFIG_HOME defines the base directory relative to which
- // user specific configuration files should be stored.
- configDir = Environment.GetEnvironmentVariable("XDG_CONFIG_HOME");
-
- // If $XDG_CONFIG_HOME is either not set or empty,
- // a default equal to $HOME /.config should be used.
- if (string.IsNullOrEmpty(configDir))
- {
- configDir = Path.Combine(
- Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
- ".config");
- }
-
- configDir = Path.Combine(configDir, "jellyfin");
- }
- }
- }
-
- // cacheDir
- // IF --cachedir
- // ELSE IF $JELLYFIN_CACHE_DIR
- // ELSE IF windows, use /cache
- // ELSE IF XDG_CACHE_HOME, use $XDG_CACHE_HOME/jellyfin
- // ELSE HOME/.cache/jellyfin
- var cacheDir = options.CacheDir;
- if (string.IsNullOrEmpty(cacheDir))
- {
- cacheDir = Environment.GetEnvironmentVariable("JELLYFIN_CACHE_DIR");
-
- if (string.IsNullOrEmpty(cacheDir))
- {
- if (OperatingSystem.IsWindows())
- {
- // Hang cache folder off already set dataDir
- cacheDir = Path.Combine(dataDir, "cache");
- }
- else
- {
- // $XDG_CACHE_HOME defines the base directory relative to which
- // user specific non-essential data files should be stored.
- cacheDir = Environment.GetEnvironmentVariable("XDG_CACHE_HOME");
-
- // If $XDG_CACHE_HOME is either not set or empty,
- // a default equal to $HOME/.cache should be used.
- if (string.IsNullOrEmpty(cacheDir))
- {
- cacheDir = Path.Combine(
- Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
- ".cache");
- }
-
- cacheDir = Path.Combine(cacheDir, "jellyfin");
- }
- }
- }
-
- // webDir
- // IF --webdir
- // ELSE IF $JELLYFIN_WEB_DIR
- // ELSE /jellyfin-web
- var webDir = options.WebDir;
- if (string.IsNullOrEmpty(webDir))
- {
- webDir = Environment.GetEnvironmentVariable("JELLYFIN_WEB_DIR");
-
- if (string.IsNullOrEmpty(webDir))
- {
- // Use default location under ResourcesPath
- webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web");
- }
- }
-
- // logDir
- // IF --logdir
- // ELSE IF $JELLYFIN_LOG_DIR
- // ELSE IF --datadir, use /log (assume portable run)
- // ELSE /log
- var logDir = options.LogDir;
- if (string.IsNullOrEmpty(logDir))
- {
- logDir = Environment.GetEnvironmentVariable("JELLYFIN_LOG_DIR");
-
- if (string.IsNullOrEmpty(logDir))
- {
- // Hang log folder off already set dataDir
- logDir = Path.Combine(dataDir, "log");
- }
- }
-
- // Normalize paths. Only possible with GetFullPath for now - https://github.com/dotnet/runtime/issues/2162
- dataDir = Path.GetFullPath(dataDir);
- logDir = Path.GetFullPath(logDir);
- configDir = Path.GetFullPath(configDir);
- cacheDir = Path.GetFullPath(cacheDir);
- webDir = Path.GetFullPath(webDir);
-
- // Ensure the main folders exist before we continue
- try
- {
- Directory.CreateDirectory(dataDir);
- Directory.CreateDirectory(logDir);
- Directory.CreateDirectory(configDir);
- Directory.CreateDirectory(cacheDir);
- }
- catch (IOException ex)
- {
- Console.Error.WriteLine("Error whilst attempting to create folder");
- Console.Error.WriteLine(ex.ToString());
- Environment.Exit(1);
- }
-
- return new ServerApplicationPaths(dataDir, logDir, configDir, cacheDir, webDir);
- }
-
- ///
- /// Initialize the logging configuration file using the bundled resource file as a default if it doesn't exist
- /// already.
- ///
- /// The application paths.
- /// A task representing the creation of the configuration file, or a completed task if the file already exists.
- public static async Task InitLoggingConfigFile(IApplicationPaths appPaths)
- {
- // Do nothing if the config file already exists
- string configPath = Path.Combine(appPaths.ConfigurationDirectoryPath, LoggingConfigFileDefault);
- if (File.Exists(configPath))
- {
- return;
- }
-
- // Get a stream of the resource contents
- // NOTE: The .csproj name is used instead of the assembly name in the resource path
- const string ResourcePath = "Jellyfin.Server.Resources.Configuration.logging.json";
- Stream resource = typeof(Program).Assembly.GetManifestResourceStream(ResourcePath)
- ?? throw new InvalidOperationException($"Invalid resource path: '{ResourcePath}'");
- await using (resource.ConfigureAwait(false))
- {
- Stream dst = new FileStream(configPath, FileMode.CreateNew, FileAccess.Write, FileShare.None, IODefaults.FileStreamBufferSize, FileOptions.Asynchronous);
- await using (dst.ConfigureAwait(false))
- {
- // Copy the resource contents to the expected file path for the config file
- await resource.CopyToAsync(dst).ConfigureAwait(false);
- }
- }
- }
-
///
/// Create the application configuration.
///
@@ -579,40 +355,6 @@ namespace Jellyfin.Server
.AddInMemoryCollection(commandLineOpts.ConvertToConfig());
}
- ///
- /// Initialize Serilog using configuration and fall back to defaults on failure.
- ///
- private static void InitializeLoggingFramework(IConfiguration configuration, IApplicationPaths appPaths)
- {
- try
- {
- // Serilog.Log is used by SerilogLoggerFactory when no logger is specified
- Log.Logger = new LoggerConfiguration()
- .ReadFrom.Configuration(configuration)
- .Enrich.FromLogContext()
- .Enrich.WithThreadId()
- .CreateLogger();
- }
- catch (Exception ex)
- {
- Log.Logger = new LoggerConfiguration()
- .WriteTo.Console(
- outputTemplate: "[{Timestamp:HH:mm:ss}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message:lj}{NewLine}{Exception}",
- formatProvider: CultureInfo.InvariantCulture)
- .WriteTo.Async(x => x.File(
- Path.Combine(appPaths.LogDirectoryPath, "log_.log"),
- rollingInterval: RollingInterval.Day,
- outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message}{NewLine}{Exception}",
- formatProvider: CultureInfo.InvariantCulture,
- encoding: Encoding.UTF8))
- .Enrich.FromLogContext()
- .Enrich.WithThreadId()
- .CreateLogger();
-
- Log.Logger.Fatal(ex, "Failed to create/read logger configuration");
- }
- }
-
private static void StartNewInstance(StartupOptions options)
{
_logger.LogInformation("Starting new instance");
diff --git a/tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs b/tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs
index 1bfa5996d8..3faea64bec 100644
--- a/tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs
@@ -4,6 +4,7 @@ using System.Globalization;
using System.IO;
using System.Threading;
using Emby.Server.Implementations;
+using Jellyfin.Server.Helpers;
using MediaBrowser.Common;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing;
@@ -33,7 +34,7 @@ namespace Jellyfin.Server.Integration.Tests
Log.Logger = new LoggerConfiguration()
.WriteTo.Console(formatProvider: CultureInfo.InvariantCulture)
.CreateLogger();
- Program.PerformStaticInitialization();
+ StartupHelpers.PerformStaticInitialization();
}
///
@@ -63,7 +64,7 @@ namespace Jellyfin.Server.Integration.Tests
// Create the logging config file
// TODO: We shouldn't need to do this since we are only logging to console
- Program.InitLoggingConfigFile(appPaths).GetAwaiter().GetResult();
+ StartupHelpers.InitLoggingConfigFile(appPaths).GetAwaiter().GetResult();
// Create a copy of the application configuration to use for startup
var startupConfig = Program.CreateAppConfiguration(commandLineOpts, appPaths);