1 files changed, 62 insertions, 32 deletions
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 3c8fff212..1fdc597ea 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -18,7 +18,7 @@ using System.Threading.Tasks;
 namespace MediaBrowser.Common.Kernel
 {
     /// <summary>
-    /// Represents a shared base kernel for both the UI and server apps
+    /// Represents a shared base kernel for both the Ui and server apps
     /// </summary>
     public abstract class BaseKernel<TConfigurationType, TApplicationPathsType> : IDisposable, IKernel
         where TConfigurationType : BaseApplicationConfiguration, new()
@@ -44,8 +44,8 @@ namespace MediaBrowser.Common.Kernel
         private IEnumerable<BaseHandler> HttpHandlers { get; set; }
 
         /// <summary>
-        /// Both the UI and server will have a built-in HttpServer.
-        /// People will inevitably want remote control apps so it's needed in the UI too.
+        /// Both the Ui and server will have a built-in HttpServer.
+        /// People will inevitably want remote control apps so it's needed in the Ui too.
         /// </summary>
         public HttpServer HttpServer { get; private set; }
 
@@ -67,25 +67,52 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         public abstract KernelContext KernelContext { get; }
 
-        public BaseKernel()
+        /// <summary>
+        /// Initializes the Kernel
+        /// </summary>
+        public async Task Init(IProgress<TaskProgress> progress)
         {
-            ApplicationPaths = new TApplicationPathsType();
+            // Performs initializations that only occur once
+            InitializeInternal(progress);
+
+            // Performs initializations that can be reloaded at anytime
+            await Reload(progress).ConfigureAwait(false);
+
+            progress.Report(new TaskProgress { Description = "Loading Complete" });
         }
 
-        public virtual async Task Init(IProgress<TaskProgress> progress)
+        /// <summary>
+        /// Performs initializations that only occur once
+        /// </summary>
+        protected virtual void InitializeInternal(IProgress<TaskProgress> progress)
         {
+            ApplicationPaths = new TApplicationPathsType();
+            
             ReloadLogger();
 
-            progress.Report(new TaskProgress() { Description = "Loading configuration", PercentComplete = 0 });
+            progress.Report(new TaskProgress { Description = "Loading configuration" });
             ReloadConfiguration();
 
-            progress.Report(new TaskProgress() { Description = "Starting Http server", PercentComplete = 5 });
+            progress.Report(new TaskProgress { Description = "Starting Http server" });
             ReloadHttpServer();
-
-            progress.Report(new TaskProgress() { Description = "Loading Plugins", PercentComplete = 10 });
-            await ReloadComposableParts().ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Performs initializations that can be reloaded at anytime
+        /// </summary>
+        public virtual async Task Reload(IProgress<TaskProgress> progress)
+        {
+            await Task.Run(() =>
+            {
+                progress.Report(new TaskProgress { Description = "Loading Plugins" });
+                ReloadComposableParts();
+
+            }).ConfigureAwait(false);
+        }
+        
+        /// <summary>
+        /// Disposes the current logger and creates a new one
+        /// </summary>
         private void ReloadLogger()
         {
             DisposeLogger();
@@ -104,23 +131,23 @@ namespace MediaBrowser.Common.Kernel
         /// Uses MEF to locate plugins
         /// Subclasses can use this to locate types within plugins
         /// </summary>
-        protected virtual Task ReloadComposableParts()
+        private void ReloadComposableParts()
         {
-            return Task.Run(() =>
-            {
-                DisposeComposableParts();
+            DisposeComposableParts();
 
-                var container = GetCompositionContainer(includeCurrentAssembly: true);
+            var container = GetCompositionContainer(includeCurrentAssembly: true);
 
-                container.ComposeParts(this);
+            container.ComposeParts(this);
 
-                OnComposablePartsLoaded();
+            OnComposablePartsLoaded();
 
-                container.Catalog.Dispose();
-                container.Dispose();
-            });
+            container.Catalog.Dispose();
+            container.Dispose();
         }
 
+        /// <summary>
+        /// Constructs an MEF CompositionContainer based on the current running assembly and all plugin assemblies
+        /// </summary>
         public CompositionContainer GetCompositionContainer(bool includeCurrentAssembly = false)
         {
             // Gets all plugin assemblies by first reading all bytes of the .dll and calling Assembly.Load against that
@@ -147,25 +174,17 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         protected virtual void OnComposablePartsLoaded()
         {
-            StartPlugins();
-        }
-
-        /// <summary>
-        /// Initializes all plugins
-        /// </summary>
-        private void StartPlugins()
-        {
+            // Start-up each plugin
             foreach (BasePlugin plugin in Plugins)
             {
                 plugin.Initialize(this);
             }
         }
 
-
         /// <summary>
         /// Reloads application configuration from the config file
         /// </summary>
-        protected virtual void ReloadConfiguration()
+        private void ReloadConfiguration()
         {
             //Configuration information for anything other than server-specific configuration will have to come via the API... -ebr
 
@@ -192,7 +211,7 @@ namespace MediaBrowser.Common.Kernel
 
             HttpServer = new HttpServer(HttpServerUrlPrefix);
 
-            HttpListener = HttpServer.Subscribe((ctx) =>
+            HttpListener = HttpServer.Subscribe(ctx =>
             {
                 BaseHandler handler = HttpHandlers.FirstOrDefault(h => h.HandlesRequest(ctx.Request));
 
@@ -213,8 +232,12 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         public virtual void Dispose()
         {
+            Logger.LogInfo("Beginning Kernel.Dispose");
+            
             DisposeComposableParts();
+
             DisposeHttpServer();
+
             DisposeLogger();
         }
 
@@ -233,6 +256,8 @@ namespace MediaBrowser.Common.Kernel
         {
             if (Plugins != null)
             {
+                Logger.LogInfo("Disposing Plugins");
+                
                 foreach (BasePlugin plugin in Plugins)
                 {
                     plugin.Dispose();
@@ -247,6 +272,8 @@ namespace MediaBrowser.Common.Kernel
         {
             if (HttpServer != null)
             {
+                Logger.LogInfo("Disposing Http Server");
+                
                 HttpServer.Dispose();
             }
 
@@ -265,6 +292,8 @@ namespace MediaBrowser.Common.Kernel
 
             if (Logger.LoggerInstance != null)
             {
+                Logger.LogInfo("Disposing Logger");
+                
                 Logger.LoggerInstance.Dispose();
             }
         }
@@ -292,6 +321,7 @@ namespace MediaBrowser.Common.Kernel
         KernelContext KernelContext { get; }
 
         Task Init(IProgress<TaskProgress> progress);
+        Task Reload(IProgress<TaskProgress> progress);
         void Dispose();
     }
 }