Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-08 23:00:51 +02:00
Code Issues 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; if (_disposed) return;
Dispose();
lock (_disposeLock) lock (_disposeLock)
{ {
if (_disposed) return; if (_disposed) return;

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

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

1
MediaBrowser.ServerApplication/MainStartup.cs
View file

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