michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

update db migration

Browse Source
This commit is contained in:
Luke Pulverenti 2016-02-04 13:04:04 -05:00
parent 7614707dad
commit d28ef71d93
5 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,7 +241,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
}
catch (Exception errorEx)
{
_logger.ErrorException("Error this.ProcessRequest(context)(Exception while writing error to the response)", errorEx);
//_logger.ErrorException("Error this.ProcessRequest(context)(Exception while writing error to the response)", errorEx);
}
}
@ -350,10 +350,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (!string.IsNullOrWhiteSpace(GlobalResponse))
{
httpRes.Write(GlobalResponse);
httpRes.ContentType = "text/plain";
if (!string.Equals(GetExtension(urlString), "html", StringComparison.OrdinalIgnoreCase))
if (string.Equals(GetExtension(urlString), "html", StringComparison.OrdinalIgnoreCase))
{
httpRes.Write(GlobalResponse);
httpRes.ContentType = "text/plain";
}
else
{
httpRes.StatusCode = 503;
}

11
MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
View File

@ -67,7 +67,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
{
OnProgress(0);
// Ensure these objects are out of the database.
// Ensure these objects are lazy loaded.
// Without this there is a deadlock that will need to be investigated
var rootChildren = _libraryManager.RootFolder.Children.ToList();
rootChildren = _libraryManager.GetUserRootFolder().Children.ToList();
@ -182,14 +183,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
progress.Report(100);
}
private void LogMessage(string msg)
{
if (EnableUnavailableMessage)
{
_logger.Info(msg);
}
}
private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
{
var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery

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

@ -583,22 +583,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
CheckDisposed();
_logger.Info("SaveItems waiting on write lock");
await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
IDbTransaction transaction = null;
try
{
_logger.Info("SaveItems creating transaction");
transaction = _connection.BeginTransaction();
foreach (var item in items)
{
_logger.Info("Saving {0}", item.Id);
cancellationToken.ThrowIfCancellationRequested();
var index = 0;

3
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -317,7 +317,8 @@ namespace MediaBrowser.Server.Startup.Common
/// <returns>Task.</returns>
public override async Task RunStartupTasks()
{
if (ServerConfigurationManager.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
if (ServerConfigurationManager.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion &&
ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
{
TaskManager.SuspendTriggers = true;
}

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

@ -18,7 +18,8 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
public void Run()
{
if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion &&
_config.Configuration.IsStartupWizardCompleted)
{
_taskManager.SuspendTriggers = true;
CleanDatabaseScheduledTask.EnableUnavailableMessage = true;