a little more kernel consolidation

2 files changed, 7 insertions, 14 deletions

diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
index f8e47434e..80b6a0f7d 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
@@ -59,7 +59,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         /// <summary>
         /// The _application host
         /// </summary>
-        private readonly IApplicationHost _applicationHost;
+        private readonly IServerApplicationHost _applicationHost;
 
         /// <summary>
         /// Gets or sets the configuration manager.
@@ -92,20 +92,14 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         private readonly List<IWebSocketListener> _webSocketListeners = new List<IWebSocketListener>();
 
         /// <summary>
-        /// The _kernel
-        /// </summary>
-        private readonly Kernel _kernel;
-
-        /// <summary>
         /// Initializes a new instance of the <see cref="ServerManager" /> class.
         /// </summary>
         /// <param name="applicationHost">The application host.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="configurationManager">The configuration manager.</param>
-        /// <param name="kernel">The kernel.</param>
         /// <exception cref="System.ArgumentNullException">applicationHost</exception>
-        public ServerManager(IApplicationHost applicationHost, IJsonSerializer jsonSerializer, ILogger logger, IServerConfigurationManager configurationManager, Kernel kernel)
+        public ServerManager(IServerApplicationHost applicationHost, IJsonSerializer jsonSerializer, ILogger logger, IServerConfigurationManager configurationManager)
         {
             if (applicationHost == null)
             {
@@ -124,7 +118,6 @@ namespace MediaBrowser.Server.Implementations.ServerManager
             _jsonSerializer = jsonSerializer;
             _applicationHost = applicationHost;
             ConfigurationManager = configurationManager;
-            _kernel = kernel;
 
             ConfigurationManager.ConfigurationUpdated += ConfigurationUpdated;
         }
@@ -161,7 +154,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         private void ReloadHttpServer()
         {
             // Only reload if the port has changed, so that we don't disconnect any active users
-            if (HttpServer != null && HttpServer.UrlPrefix.Equals(_kernel.HttpServerUrlPrefix, StringComparison.OrdinalIgnoreCase))
+            if (HttpServer != null && HttpServer.UrlPrefix.Equals(_applicationHost.HttpServerUrlPrefix, StringComparison.OrdinalIgnoreCase))
             {
                 return;
             }
@@ -174,7 +167,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
             {
                 HttpServer = _applicationHost.Resolve<IHttpServer>();
                 HttpServer.EnableHttpRequestLogging = ConfigurationManager.Configuration.EnableHttpLevelLogging;
-                HttpServer.Start(_kernel.HttpServerUrlPrefix);
+                HttpServer.Start(_applicationHost.HttpServerUrlPrefix);
             }
             catch (HttpListenerException ex)
             {
diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs
index 297033cd6..6cd816e51 100644
--- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs
@@ -49,7 +49,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         /// <param name="dbPath">The db path.</param>
         /// <returns>Task{System.Boolean}.</returns>
         /// <exception cref="System.ArgumentNullException">dbPath</exception>
-        protected async Task ConnectToDb(string dbPath)
+        protected Task ConnectToDb(string dbPath)
         {
             if (string.IsNullOrEmpty(dbPath))
             {
@@ -68,7 +68,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
 
             Connection = new SQLiteConnection(connectionstr.ConnectionString);
 
-            await Connection.OpenAsync().ConfigureAwait(false);
+            return Connection.OpenAsync();
         }
 
         /// <summary>
@@ -164,7 +164,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
             {
                 throw new ArgumentNullException("reader");
             }
-            
+
             var memoryStream = new MemoryStream();
             var num = 0L;
             var array = new byte[4096];