aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs13
-rw-r--r--MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs2
-rw-r--r--MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs12
3 files changed, 14 insertions, 13 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index a11eb3aaa..e69ff367a 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -350,16 +350,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (!string.IsNullOrWhiteSpace(GlobalResponse))
{
- if (string.Equals(GetExtension(urlString), "html", StringComparison.OrdinalIgnoreCase))
- {
- httpRes.Write(GlobalResponse);
- httpRes.ContentType = "text/plain";
- }
- else
- {
- httpRes.StatusCode = 503;
- }
+ httpRes.StatusCode = 503;
+ httpRes.ContentType = "text/html";
+ httpRes.Write(GlobalResponse);
+ httpRes.Close();
return Task.FromResult(true);
}
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 9d6343568..a85872951 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -80,7 +80,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
private IDbCommand _updateInheritedRatingCommand;
- private const int LatestSchemaVersion = 45;
+ private const int LatestSchemaVersion = 48;
/// <summary>
/// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs b/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
index 3cd92bcde..65517c09c 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
+++ b/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
@@ -18,15 +18,21 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
public void Run()
{
- if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion &&
- _config.Configuration.IsStartupWizardCompleted)
+ if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
{
+ if (!_config.Configuration.IsStartupWizardCompleted)
+ {
+ _config.Configuration.MigrationVersion = CleanDatabaseScheduledTask.MigrationVersion;
+ _config.SaveConfiguration();
+ return;
+ }
+
_taskManager.SuspendTriggers = true;
CleanDatabaseScheduledTask.EnableUnavailableMessage = true;
Task.Run(async () =>
{
- await Task.Delay(100).ConfigureAwait(false);
+ await Task.Delay(1000).ConfigureAwait(false);
_taskManager.Execute<CleanDatabaseScheduledTask>();
});