diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-27 12:28:15 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-27 12:28:15 -0500 |
| commit | 3d9e79c46fca3514b282da8337be4321d552b609 (patch) | |
| tree | eadc07984d8bdb90ae604d3a379214d291a88303 | |
| parent | 0f6e7c62183620ba03656463d776b0d61c15fec4 (diff) | |
moved server init down to base app host
| -rw-r--r-- | MediaBrowser.Common.Implementations/BaseApplicationHost.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Common/Kernel/BaseKernel.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 11 |
3 files changed, 2 insertions, 13 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 45b1f0e3f..0d261bdb8 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -145,8 +145,9 @@ namespace MediaBrowser.Common.Implementations Resolve<ITaskManager>().AddTasks(GetExports<IScheduledTask>(false)); Resolve<IHttpServer>().Init(GetExports<IRestfulService>(false)); + Resolve<IServerManager>().AddWebSocketListeners(GetExports<IWebSocketListener>(false)); - Resolve<IServerManager>().AddWebSocketListeners(GetExports<IWebSocketListener>()); + Resolve<IServerManager>().Start(); } /// <summary> diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 68983064e..6183c2839 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -231,7 +231,6 @@ namespace MediaBrowser.Common.Kernel await OnComposablePartsLoaded().ConfigureAwait(false); ServerManager = ApplicationHost.Resolve<IServerManager>(); - ServerManager.Start(); } /// <summary> diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index f4b110b39..8205018ab 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -128,17 +128,6 @@ namespace MediaBrowser.ServerApplication } /// <summary> - /// Finds the parts. - /// </summary> - protected override void FindParts() - { - Resolve<ITaskManager>().AddTasks(GetExports<IScheduledTask>(false)); - - Resolve<IHttpServer>().Init(GetExports<IRestfulService>(false)); - Resolve<IServerManager>().AddWebSocketListeners(GetExports<IWebSocketListener>(false)); - } - - /// <summary> /// Restarts this instance. /// </summary> public void Restart() |