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

Don't close the socket response multiple times

Browse Source
This commit is contained in:
Claus Vium 2019-02-24 21:44:56 +01:00
parent 4a3e42e779
commit 6e07eab247
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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