lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1000 from cvium/fix_object_disposed

Browse Source 
Don't close the socket response multiple times
This commit is contained in:
Vasily 2019-02-25 16:52:31 +03:00 committed by GitHub
commit b3438559cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
View File

@ -164,33 +164,19 @@ namespace Jellyfin.Server.SocketSharp
Endpoint = endpoint Endpoint = endpoint
}); });
await ReceiveWebSocketAsync(ctx, socket).ConfigureAwait(false); await socket.StartReceive().ConfigureAwait(false);
} }
} }
else else
{ {
_logger.LogWarning("Web socket connection not allowed"); _logger.LogWarning("Web socket connection not allowed");
ctx.Response.StatusCode = 401; TryClose(ctx, 401);
ctx.Response.Close();
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "AcceptWebSocketAsync error"); _logger.LogError(ex, "AcceptWebSocketAsync error");
ctx.Response.StatusCode = 500; TryClose(ctx, 500);
ctx.Response.Close();
}
}
private async Task ReceiveWebSocketAsync(HttpListenerContext ctx, SharpWebSocket socket)
{
try
{
await socket.StartReceive().ConfigureAwait(false);
}
finally
{
TryClose(ctx, 200);
} }
} }
@ -201,10 +187,6 @@ namespace Jellyfin.Server.SocketSharp
ctx.Response.StatusCode = statusCode; ctx.Response.StatusCode = statusCode;
ctx.Response.Close(); ctx.Response.Close();
} }
catch (ObjectDisposedException)
{
// TODO: Investigate and properly fix.
}
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error closing web socket response"); _logger.LogError(ex, "Error closing web socket response");