diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs
index cd5a2ce853..8b4b61e290 100644
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -57,33 +57,5 @@ namespace Jellyfin.Server
///
protected override void ShutdownInternal() => Program.Shutdown();
-
- ///
- /// Runs the migration routines if necessary.
- ///
- public void TryMigrate()
- {
- var previousVersion = ConfigurationManager.CommonConfiguration.PreviousVersion;
- switch (ApplicationVersion.CompareTo(previousVersion))
- {
- case 1:
- Logger.LogWarning("Version check shows Jellyfin was updated: previous version={0}, current version={1}", previousVersion, ApplicationVersion);
-
- Migrations.Run(this, Logger);
-
- ConfigurationManager.CommonConfiguration.PreviousVersion = ApplicationVersion;
- ConfigurationManager.SaveConfiguration();
- break;
- case 0:
- // nothing to do, versions match
- break;
- case -1:
- Logger.LogWarning("Version check shows Jellyfin was rolled back, use at your own risk: previous version={0}, current version={1}", previousVersion, ApplicationVersion);
- // no "rollback" routines for now
- ConfigurationManager.CommonConfiguration.PreviousVersion = ApplicationVersion;
- ConfigurationManager.SaveConfiguration();
- break;
- }
- }
}
}
diff --git a/Jellyfin.Server/Migrations.cs b/Jellyfin.Server/Migrations.cs
deleted file mode 100644
index 95fea4ea55..0000000000
--- a/Jellyfin.Server/Migrations.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Server
-{
- ///
- /// The class that knows how migrate between different Jellyfin versions.
- ///
- internal static class Migrations
- {
- private static readonly IUpdater[] _migrations =
- {
- new Pre10_5()
- };
-
- ///
- /// Interface that descibes a migration routine.
- ///
- private interface IUpdater
- {
- ///
- /// Gets maximum version this Updater applies to.
- /// If current version is greater or equal to it, skip the updater.
- ///
- public abstract Version Maximum { get; }
-
- ///
- /// Execute the migration from version "from".
- ///
- /// Host that hosts current version.
- /// Host logger.
- /// Version to migrate from.
- /// Whether configuration was changed.
- public abstract bool Perform(CoreAppHost host, ILogger logger, Version from);
- }
-
- ///
- /// Run all needed migrations.
- ///
- /// CoreAppHost that hosts current version.
- /// AppHost logger.
- /// Whether anything was changed.
- public static bool Run(CoreAppHost host, ILogger logger)
- {
- bool updated = false;
- var version = host.ServerConfigurationManager.CommonConfiguration.PreviousVersion;
-
- for (var i = 0; i < _migrations.Length; i++)
- {
- var updater = _migrations[i];
- if (version.CompareTo(updater.Maximum) >= 0)
- {
- logger.LogDebug("Skipping updater {0} as current version {1} >= its maximum applicable version {2}", updater, version, updater.Maximum);
- continue;
- }
-
- if (updater.Perform(host, logger, version))
- {
- updated = true;
- }
-
- version = updater.Maximum;
- }
-
- return updated;
- }
-
- private class Pre10_5 : IUpdater
- {
- public Version Maximum { get => Version.Parse("10.5.0"); }
-
- public bool Perform(CoreAppHost host, ILogger logger, Version from)
- {
- // Set EnableThrottling to false as it wasn't used before, and in 10.5.0 it may introduce issues
- var encoding = ((IConfigurationManager)host.ServerConfigurationManager).GetConfiguration("encoding");
- if (encoding.EnableThrottling)
- {
- logger.LogInformation("Disabling transcoding throttling during migration");
- encoding.EnableThrottling = false;
-
- host.ServerConfigurationManager.SaveConfiguration("encoding", encoding);
- return true;
- }
-
- return false;
- }
- }
- }
-}
diff --git a/Jellyfin.Server/Migrations/IUpdater.cs b/Jellyfin.Server/Migrations/IUpdater.cs
new file mode 100644
index 0000000000..9b749841cf
--- /dev/null
+++ b/Jellyfin.Server/Migrations/IUpdater.cs
@@ -0,0 +1,23 @@
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Migrations
+{
+ ///
+ /// Interface that descibes a migration routine.
+ ///
+ internal interface IUpdater
+ {
+ ///
+ /// Gets the name of the migration, must be unique.
+ ///
+ public abstract string Name { get; }
+
+ ///
+ /// Execute the migration routine.
+ ///
+ /// Host that hosts current version.
+ /// Host logger.
+ public abstract void Perform(CoreAppHost host, ILogger logger);
+ }
+}
diff --git a/Jellyfin.Server/Migrations/MigrationOptions.cs b/Jellyfin.Server/Migrations/MigrationOptions.cs
new file mode 100644
index 0000000000..6b7831158f
--- /dev/null
+++ b/Jellyfin.Server/Migrations/MigrationOptions.cs
@@ -0,0 +1,23 @@
+namespace Jellyfin.Server.Migrations
+{
+ ///
+ /// Configuration part that holds all migrations that were applied.
+ ///
+ public class MigrationOptions
+ {
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public MigrationOptions()
+ {
+ Applied = System.Array.Empty();
+ }
+
+#pragma warning disable CA1819 // Properties should not return arrays
+ ///
+ /// Gets or sets the list of applied migration routine names.
+ ///
+ public string[] Applied { get; set; }
+#pragma warning restore CA1819 // Properties should not return arrays
+ }
+}
diff --git a/Jellyfin.Server/Migrations/MigrationRunner.cs b/Jellyfin.Server/Migrations/MigrationRunner.cs
new file mode 100644
index 0000000000..ca4c79cfd3
--- /dev/null
+++ b/Jellyfin.Server/Migrations/MigrationRunner.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Linq;
+using MediaBrowser.Common.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Migrations
+{
+ ///
+ /// The class that knows which migrations to apply and how to apply them.
+ ///
+ public sealed class MigrationRunner
+ {
+ ///
+ /// The list of known migrations, in order of applicability.
+ ///
+ internal static readonly IUpdater[] Migrations =
+ {
+ new Routines.DisableTranscodingThrottling()
+ };
+
+ ///
+ /// Run all needed migrations.
+ ///
+ /// CoreAppHost that hosts current version.
+ /// Factory for making the logger.
+ public static void Run(CoreAppHost host, ILoggerFactory loggerFactory)
+ {
+ var logger = loggerFactory.CreateLogger();
+ var migrationOptions = ((IConfigurationManager)host.ServerConfigurationManager).GetConfiguration(MigrationsListStore.StoreKey);
+
+ if (!host.ServerConfigurationManager.Configuration.IsStartupWizardCompleted && migrationOptions.Applied.Length == 0)
+ {
+ // If startup wizard is not finished, this is a fresh install.
+ // Don't run any migrations, just mark all of them as applied.
+ logger.LogInformation("Marking all known migrations as applied because this is fresh install");
+ migrationOptions.Applied = Migrations.Select(m => m.Name).ToArray();
+ host.ServerConfigurationManager.SaveConfiguration(MigrationsListStore.StoreKey, migrationOptions);
+ return;
+ }
+
+ var applied = migrationOptions.Applied.ToList();
+
+ for (var i = 0; i < Migrations.Length; i++)
+ {
+ var updater = Migrations[i];
+ if (applied.Contains(updater.Name))
+ {
+ logger.LogDebug("Skipping migration '{Name}' since it is already applied", updater.Name);
+ continue;
+ }
+
+ logger.LogInformation("Applying migration '{Name}'", updater.Name);
+ try
+ {
+ updater.Perform(host, logger);
+ }
+ catch (Exception ex)
+ {
+ logger.LogError(ex, "Could not apply migration '{Name}'", updater.Name);
+ throw;
+ }
+
+ logger.LogInformation("Migration '{Name}' applied successfully", updater.Name);
+ applied.Add(updater.Name);
+ }
+
+ if (applied.Count > migrationOptions.Applied.Length)
+ {
+ logger.LogInformation("Some migrations were run, saving the state");
+ migrationOptions.Applied = applied.ToArray();
+ host.ServerConfigurationManager.SaveConfiguration(MigrationsListStore.StoreKey, migrationOptions);
+ }
+ }
+ }
+}
diff --git a/Jellyfin.Server/Migrations/MigrationsFactory.cs b/Jellyfin.Server/Migrations/MigrationsFactory.cs
new file mode 100644
index 0000000000..23c1b1ee6f
--- /dev/null
+++ b/Jellyfin.Server/Migrations/MigrationsFactory.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using MediaBrowser.Common.Configuration;
+
+namespace Jellyfin.Server.Migrations
+{
+ ///
+ /// A factory that can find a persistent file of the migration configuration, which lists all applied migrations.
+ ///
+ public class MigrationsFactory : IConfigurationFactory
+ {
+ ///
+ public IEnumerable GetConfigurations()
+ {
+ return new[]
+ {
+ new MigrationsListStore()
+ };
+ }
+ }
+}
diff --git a/Jellyfin.Server/Migrations/MigrationsListStore.cs b/Jellyfin.Server/Migrations/MigrationsListStore.cs
new file mode 100644
index 0000000000..7a1ca66714
--- /dev/null
+++ b/Jellyfin.Server/Migrations/MigrationsListStore.cs
@@ -0,0 +1,24 @@
+using MediaBrowser.Common.Configuration;
+
+namespace Jellyfin.Server.Migrations
+{
+ ///
+ /// A configuration that lists all the migration routines that were applied.
+ ///
+ public class MigrationsListStore : ConfigurationStore
+ {
+ ///
+ /// The name of the configuration in the storage.
+ ///
+ public static readonly string StoreKey = "migrations";
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public MigrationsListStore()
+ {
+ ConfigurationType = typeof(MigrationOptions);
+ Key = StoreKey;
+ }
+ }
+}
diff --git a/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs b/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs
new file mode 100644
index 0000000000..936c3640e0
--- /dev/null
+++ b/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs
@@ -0,0 +1,32 @@
+using System;
+using System.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Migrations.Routines
+{
+ ///
+ /// Disable transcode throttling for all installations since it is currently broken for certain video formats.
+ ///
+ internal class DisableTranscodingThrottling : IUpdater
+ {
+ ///
+ public string Name => "DisableTranscodingThrottling";
+
+ ///
+ public void Perform(CoreAppHost host, ILogger logger)
+ {
+ // Set EnableThrottling to false since it wasn't used before and may introduce issues
+ var encoding = ((IConfigurationManager)host.ServerConfigurationManager).GetConfiguration("encoding");
+ if (encoding.EnableThrottling)
+ {
+ logger.LogInformation("Disabling transcoding throttling during migration");
+ encoding.EnableThrottling = false;
+
+ host.ServerConfigurationManager.SaveConfiguration("encoding", encoding);
+ }
+ }
+ }
+}
diff --git a/Jellyfin.Server/Migrations/Routines/DisableZealousLogging.cs b/Jellyfin.Server/Migrations/Routines/DisableZealousLogging.cs
new file mode 100644
index 0000000000..501f8f8654
--- /dev/null
+++ b/Jellyfin.Server/Migrations/Routines/DisableZealousLogging.cs
@@ -0,0 +1,29 @@
+using System;
+using System.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace Jellyfin.Server.Migrations.Routines
+{
+ ///
+ /// Updater that takes care of bringing configuration up to 10.5.0 standards.
+ ///
+ internal class DisableZealousLogging : IUpdater
+ {
+ ///
+ public string Name => "DisableZealousLogging";
+
+ ///
+ // This tones down logging from some components
+ public void Perform(CoreAppHost host, ILogger logger)
+ {
+ string configPath = Path.Combine(host.ServerConfigurationManager.ApplicationPaths.ConfigurationDirectoryPath, Program.LoggingConfigFile);
+ // TODO: fix up the config
+ throw new NotImplementedException("don't know how to fix logging yet");
+ }
+ }
+}
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index aa1bdb1691..0271861054 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -38,6 +38,11 @@ namespace Jellyfin.Server
///
public static class Program
{
+ ///
+ /// The name of logging configuration file.
+ ///
+ public static readonly string LoggingConfigFile = "logging.json";
+
private static readonly CancellationTokenSource _tokenSource = new CancellationTokenSource();
private static readonly ILoggerFactory _loggerFactory = new SerilogLoggerFactory();
private static ILogger _logger = NullLogger.Instance;
@@ -182,7 +187,7 @@ namespace Jellyfin.Server
// A bit hacky to re-use service provider since ASP.NET doesn't allow a custom service collection.
appHost.ServiceProvider = host.Services;
appHost.FindParts();
- appHost.TryMigrate();
+ Migrations.MigrationRunner.Run(appHost, _loggerFactory);
try
{
@@ -438,7 +443,7 @@ namespace Jellyfin.Server
private static async Task CreateConfiguration(IApplicationPaths appPaths)
{
const string ResourcePath = "Jellyfin.Server.Resources.Configuration.logging.json";
- string configPath = Path.Combine(appPaths.ConfigurationDirectoryPath, "logging.json");
+ string configPath = Path.Combine(appPaths.ConfigurationDirectoryPath, LoggingConfigFile);
if (!File.Exists(configPath))
{
@@ -460,7 +465,7 @@ namespace Jellyfin.Server
return new ConfigurationBuilder()
.SetBasePath(appPaths.ConfigurationDirectoryPath)
.AddInMemoryCollection(ConfigurationOptions.Configuration)
- .AddJsonFile("logging.json", false, true)
+ .AddJsonFile(LoggingConfigFile, false, true)
.AddEnvironmentVariables("JELLYFIN_")
.Build();
}