From 7b094f3f8a89bd058852b772f2b535f4dede4f73 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 24 May 2016 13:36:23 -0400
Subject: [PATCH 1/2] add error handling with migrations

---
 .../ApplicationHost.cs                        | 19 +++++-
 .../MediaBrowser.Server.Startup.Common.csproj |  1 -
 .../Migrations/RenameXmlOptions.cs            | 61 -------------------
 3 files changed, 16 insertions(+), 65 deletions(-)
 delete mode 100644 MediaBrowser.Server.Startup.Common/Migrations/RenameXmlOptions.cs

diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index eef8c5193..7b958779d 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -359,12 +359,18 @@ namespace MediaBrowser.Server.Startup.Common
         {
             var migrations = new List<IVersionMigration>
             {
-                new RenameXmlOptions(ServerConfigurationManager)
             };
 
             foreach (var task in migrations)
             {
-                task.Run();
+                try
+                {
+                    task.Run();
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error running migration", ex);
+                }
             }
         }
 
@@ -379,7 +385,14 @@ namespace MediaBrowser.Server.Startup.Common
 
             foreach (var task in migrations)
             {
-                task.Run();
+                try
+                {
+                    task.Run();
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error running migration", ex);
+                }
             }
         }
 
diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
index 19ce9ed9e..d0769f488 100644
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -75,7 +75,6 @@
     <Compile Include="Migrations\DbMigration.cs" />
     <Compile Include="Migrations\MovieDbEpisodeProviderMigration.cs" />
     <Compile Include="Migrations\OmdbEpisodeProviderMigration.cs" />
-    <Compile Include="Migrations\RenameXmlOptions.cs" />
     <Compile Include="NativeEnvironment.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StartupOptions.cs" />
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/RenameXmlOptions.cs b/MediaBrowser.Server.Startup.Common/Migrations/RenameXmlOptions.cs
deleted file mode 100644
index 49114b96f..000000000
--- a/MediaBrowser.Server.Startup.Common/Migrations/RenameXmlOptions.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using MediaBrowser.Controller.Configuration;
-using System;
-
-namespace MediaBrowser.Server.Startup.Common.Migrations
-{
-    public class RenameXmlOptions : IVersionMigration
-    {
-        private readonly IServerConfigurationManager _config;
-
-        public RenameXmlOptions(IServerConfigurationManager config)
-        {
-            _config = config;
-        }
-
-        public void Run()
-        {
-            var changed = false;
-
-            foreach (var option in _config.Configuration.MetadataOptions)
-            {
-                if (Migrate(option.DisabledMetadataSavers))
-                {
-                    changed = true;
-                }
-                if (Migrate(option.LocalMetadataReaderOrder))
-                {
-                    changed = true;
-                }
-            }
-
-            if (changed)
-            {
-                _config.SaveConfiguration();
-            }
-        }
-
-        private bool Migrate(string[] options)
-        {
-            var changed = false;
-
-            if (options != null)
-            {
-                for (var i = 0; i < options.Length; i++)
-                {
-                    if (string.Equals(options[i], "Media Browser Legacy Xml", StringComparison.OrdinalIgnoreCase))
-                    {
-                        options[i] = "Emby Xml";
-                        changed = true;
-                    }
-                    else if (string.Equals(options[i], "Media Browser Xml", StringComparison.OrdinalIgnoreCase))
-                    {
-                        options[i] = "Emby Xml";
-                        changed = true;
-                    }
-                }
-            }
-
-            return changed;
-        }
-    }
-}

From 41d551b35d9acd1c76b035349a662dc09b93ee91 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 24 May 2016 14:02:26 -0400
Subject: [PATCH 2/2] add startup logging

---
 .../BaseApplicationHost.cs                             | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index a76ab9f07..6a92533ed 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -252,7 +252,15 @@ namespace MediaBrowser.Common.Implementations
             var innerProgress = new ActionableProgress<double>();
             innerProgress.RegisterAction(p => progress.Report(.8 * p + 15));
 
-            await RegisterResources(innerProgress).ConfigureAwait(false);
+            try
+            {
+                await RegisterResources(innerProgress).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error in RegisterResource", ex);
+                throw;
+            }
 
             FindParts();
             progress.Report(95);