From 66263973507cb37d514c783c48d38f7916cf4558 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Fri, 1 Sep 2017 21:55:47 -0700
Subject: [PATCH] Move DB migration to start

---
 src/NzbDrone.Host/ApplicationServer.cs | 10 ++++++++--
 src/NzbDrone.Host/Router.cs            |  7 -------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/NzbDrone.Host/ApplicationServer.cs b/src/NzbDrone.Host/ApplicationServer.cs
index 29d56304e..b884a9cb8 100644
--- a/src/NzbDrone.Host/ApplicationServer.cs
+++ b/src/NzbDrone.Host/ApplicationServer.cs
@@ -1,8 +1,10 @@
-using System;
+using System;
 using System.ServiceProcess;
 using NLog;
+using NzbDrone.Common.Composition;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Host.Owin;
@@ -22,6 +24,7 @@ namespace NzbDrone.Host
         private readonly IHostController _hostController;
         private readonly IStartupContext _startupContext;
         private readonly IBrowserService _browserService;
+        private readonly IContainer _container;
         private readonly Logger _logger;
 
         public NzbDroneServiceFactory(IConfigFileProvider configFileProvider,
@@ -29,6 +32,7 @@ namespace NzbDrone.Host
                                       IRuntimeInfo runtimeInfo,
                                       IStartupContext startupContext,
                                       IBrowserService browserService,
+                                      IContainer container,
                                       Logger logger)
         {
             _configFileProvider = configFileProvider;
@@ -36,6 +40,7 @@ namespace NzbDrone.Host
             _runtimeInfo = runtimeInfo;
             _startupContext = startupContext;
             _browserService = browserService;
+            _container = container;
             _logger = logger;
         }
 
@@ -52,6 +57,7 @@ namespace NzbDrone.Host
             }
 
             _runtimeInfo.IsExiting = false;
+            DbFactory.RegisterDatabase(_container);
             _hostController.StartServer();
 
             if (!_startupContext.Flags.Contains(StartupContext.NO_BROWSER)
@@ -93,4 +99,4 @@ namespace NzbDrone.Host
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/NzbDrone.Host/Router.cs b/src/NzbDrone.Host/Router.cs
index 354bca3aa..e15c54713 100644
--- a/src/NzbDrone.Host/Router.cs
+++ b/src/NzbDrone.Host/Router.cs
@@ -1,8 +1,6 @@
 using NLog;
 using NzbDrone.Common;
-using NzbDrone.Common.Composition;
 using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Host
 {
@@ -12,21 +10,18 @@ namespace NzbDrone.Host
         private readonly IServiceProvider _serviceProvider;
         private readonly IConsoleService _consoleService;
         private readonly IRuntimeInfo _runtimeInfo;
-        private readonly IContainer _container;
         private readonly Logger _logger;
 
         public Router(INzbDroneServiceFactory nzbDroneServiceFactory,
                       IServiceProvider serviceProvider,
                       IConsoleService consoleService,
                       IRuntimeInfo runtimeInfo,
-                      IContainer container,
                       Logger logger)
         {
             _nzbDroneServiceFactory = nzbDroneServiceFactory;
             _serviceProvider = serviceProvider;
             _consoleService = consoleService;
             _runtimeInfo = runtimeInfo;
-            _container = container;
             _logger = logger;
         }
 
@@ -40,7 +35,6 @@ namespace NzbDrone.Host
                     {
                         _logger.Debug("Service selected");
 
-                        DbFactory.RegisterDatabase(_container);
                         _serviceProvider.Run(_nzbDroneServiceFactory.Build());
 
                         break;
@@ -50,7 +44,6 @@ namespace NzbDrone.Host
                     {
                         _logger.Debug(_runtimeInfo.IsWindowsTray ? "Tray selected" : "Console selected");
 
-                        DbFactory.RegisterDatabase(_container);
                         _nzbDroneServiceFactory.Start();
 
                         break;