Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 6 insertions, 11 deletions

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 017f69b62..1a2ab4a51 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -171,6 +171,7 @@ namespace MediaBrowser.Common.Implementations
             Logger = LogManager.GetLogger("App");
 
             LogManager.ReloadLogger(ConfigurationManager.CommonConfiguration.EnableDebugLevelLogging ? LogSeverity.Debug : LogSeverity.Info);
+            OnLoggerLoaded();
 
             DiscoverTypes();
 
@@ -183,6 +184,11 @@ namespace MediaBrowser.Common.Implementations
             await RunStartupTasks().ConfigureAwait(false);
         }
 
+        protected virtual void OnLoggerLoaded()
+        {
+            
+        }
+
         /// <summary>
         /// Runs the startup tasks.
         /// </summary>
@@ -195,8 +201,6 @@ namespace MediaBrowser.Common.Implementations
 
                 Task.Run(() => ConfigureAutoRunAtStartup());
 
-                Task.Run(() => SecurityManager.LoadAllRegistrationInfo());
-
                 ConfigurationManager.ConfigurationUpdated += ConfigurationManager_ConfigurationUpdated;
             });
         }
@@ -236,11 +240,6 @@ namespace MediaBrowser.Common.Implementations
 
             var assemblies = GetComposablePartAssemblies().ToArray();
 
-            foreach (var assembly in assemblies)
-            {
-                Logger.Info("Loading {0}", assembly.FullName);
-            }
-
             AllTypes = assemblies.SelectMany(GetTypes).ToArray();
 
             AllConcreteTypes = AllTypes.Where(t => t.IsClass && !t.IsAbstract && !t.IsInterface && !t.IsGenericType).ToArray();
@@ -270,19 +269,15 @@ namespace MediaBrowser.Common.Implementations
                 RegisterSingleInstance(TaskManager);
 
                 HttpClient = new HttpClientManager.HttpClientManager(ApplicationPaths, Logger);
-
                 RegisterSingleInstance(HttpClient);
 
                 NetworkManager = new NetworkManager();
-
                 RegisterSingleInstance(NetworkManager);
 
                 SecurityManager = new PluginSecurityManager(this, HttpClient, JsonSerializer, ApplicationPaths);
-
                 RegisterSingleInstance(SecurityManager);
 
                 PackageManager = new PackageManager(SecurityManager, NetworkManager, HttpClient, ApplicationPaths, JsonSerializer, Logger);
-
                 RegisterSingleInstance(PackageManager);
             });
         }