michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix server restart

Browse Source
This commit is contained in:
Luke Pulverenti 2017-02-16 02:13:32 -05:00
parent db7e78640a
commit aa290062d6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -767,8 +767,6 @@ namespace Emby.Server.Implementations.HttpServer
{
if (_disposed) return;
Dispose();
lock (_disposeLock)
{
if (_disposed) return;

4
Emby.Server.Implementations/ServerManager/ServerManager.cs
View File

@ -303,6 +303,7 @@ namespace Emby.Server.Implementations.ServerManager
/// </summary>
private void DisposeHttpServer()
{
_logger.Info("Disposing web socket connections");
foreach (var socket in _webSocketConnections)
{
// Dispose the connection
@ -314,6 +315,9 @@ namespace Emby.Server.Implementations.ServerManager
if (HttpServer != null)
{
HttpServer.WebSocketConnected -= HttpServer_WebSocketConnected;
_logger.Info("Disposing http server");
HttpServer.Dispose();
}
}

1
MediaBrowser.ServerApplication/MainStartup.cs
View File

@ -676,6 +676,7 @@ namespace MediaBrowser.ServerApplication
_appHostDisposed = true;
_appHost.Dispose();
_logger.Info("App host dispose complete");
}
}