mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
Merge pull request #1236 from MediaBrowser/master
add more migration error handling
This commit is contained in:
commit
a9e0797878
1 changed files with 33 additions and 15 deletions
|
@ -224,6 +224,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||
}
|
||||
|
||||
private void MigrateMediaStreams(string file)
|
||||
{
|
||||
try
|
||||
{
|
||||
var backupFile = file + ".bak";
|
||||
File.Copy(file, backupFile, true);
|
||||
|
@ -235,18 +237,21 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||
"REPLACE INTO mediastreams("+columns+") SELECT "+columns+" FROM MediaInfoOld.mediastreams;"
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
_connection.RunQueries(queries, _logger);
|
||||
File.Delete(file);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.ErrorException("Error migrating media info database", ex);
|
||||
}
|
||||
finally
|
||||
{
|
||||
TryDeleteFile(file);
|
||||
}
|
||||
}
|
||||
|
||||
private void MigrateChapters(string file)
|
||||
{
|
||||
try
|
||||
{
|
||||
var backupFile = file + ".bak";
|
||||
File.Copy(file, backupFile, true);
|
||||
|
@ -256,15 +261,28 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||
"REPLACE INTO "+ChaptersTableName+"(ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) SELECT ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath FROM ChaptersOld.Chapters;"
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
_connection.RunQueries(queries, _logger);
|
||||
File.Delete(file);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.ErrorException("Error migrating chapter database", ex);
|
||||
}
|
||||
finally
|
||||
{
|
||||
TryDeleteFile(file);
|
||||
}
|
||||
}
|
||||
|
||||
private void TryDeleteFile(string file)
|
||||
{
|
||||
try
|
||||
{
|
||||
File.Delete(file);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.ErrorException("Error deleting file {0}", ex, file);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in a new issue