lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1465 from MediaBrowser/beta

Browse Source 
Beta
This commit is contained in:
Luke 2016-02-14 23:49:23 -05:00
commit dd9f5270ea
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -350,16 +350,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (!string.IsNullOrWhiteSpace(GlobalResponse)) if (!string.IsNullOrWhiteSpace(GlobalResponse))
{ {
if (string.Equals(GetExtension(urlString), "html", StringComparison.OrdinalIgnoreCase)) httpRes.StatusCode = 503;
{ httpRes.ContentType = "text/html";
httpRes.Write(GlobalResponse); httpRes.Write(GlobalResponse);
httpRes.ContentType = "text/plain";
}
else
{
httpRes.StatusCode = 503;
}
httpRes.Close();
return Task.FromResult(true); return Task.FromResult(true);
} }

2
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -80,7 +80,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
private IDbCommand _updateInheritedRatingCommand; private IDbCommand _updateInheritedRatingCommand;
private const int LatestSchemaVersion = 45; private const int LatestSchemaVersion = 48;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="SqliteItemRepository"/> class. /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.

12
MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
View File

@ -18,15 +18,21 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
public void Run() public void Run()
{ {
if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion && if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
_config.Configuration.IsStartupWizardCompleted)
{ {
if (!_config.Configuration.IsStartupWizardCompleted)
{
_config.Configuration.MigrationVersion = CleanDatabaseScheduledTask.MigrationVersion;
_config.SaveConfiguration();
return;
}
_taskManager.SuspendTriggers = true; _taskManager.SuspendTriggers = true;
CleanDatabaseScheduledTask.EnableUnavailableMessage = true; CleanDatabaseScheduledTask.EnableUnavailableMessage = true;
Task.Run(async () => Task.Run(async () =>
{ {
await Task.Delay(100).ConfigureAwait(false); await Task.Delay(1000).ConfigureAwait(false);
_taskManager.Execute<CleanDatabaseScheduledTask>(); _taskManager.Execute<CleanDatabaseScheduledTask>();
}); });