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

Minor fixes for websocket code

Browse Source
This commit is contained in:
Bond_009 2020-08-01 15:03:33 +02:00
parent 7621c8b806
commit d191fec3ac
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -567,7 +567,7 @@ namespace Emby.Server.Implementations.HttpServer
WebSocket webSocket = await context.WebSockets.AcceptWebSocketAsync().ConfigureAwait(false); WebSocket webSocket = await context.WebSockets.AcceptWebSocketAsync().ConfigureAwait(false);
var connection = new WebSocketConnection( using var connection = new WebSocketConnection(
_loggerFactory.CreateLogger<WebSocketConnection>(), _loggerFactory.CreateLogger<WebSocketConnection>(),
webSocket, webSocket,
context.Connection.RemoteIpAddress, context.Connection.RemoteIpAddress,

8
Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
View File

@ -19,7 +19,7 @@ namespace Emby.Server.Implementations.HttpServer
/// <summary> /// <summary>
/// Class WebSocketConnection. /// Class WebSocketConnection.
/// </summary> /// </summary>
public class WebSocketConnection : IWebSocketConnection public class WebSocketConnection : IWebSocketConnection, IDisposable
{ {
/// <summary> /// <summary>
/// The logger. /// The logger.
@ -119,7 +119,7 @@ namespace Emby.Server.Implementations.HttpServer
Memory<byte> memory = writer.GetMemory(512); Memory<byte> memory = writer.GetMemory(512);
try try
{ {
receiveresult = await _socket.ReceiveAsync(memory, cancellationToken); receiveresult = await _socket.ReceiveAsync(memory, cancellationToken).ConfigureAwait(false);
} }
catch (WebSocketException ex) catch (WebSocketException ex)
{ {
@ -137,7 +137,7 @@ namespace Emby.Server.Implementations.HttpServer
writer.Advance(bytesRead); writer.Advance(bytesRead);
// Make the data available to the PipeReader // Make the data available to the PipeReader
FlushResult flushResult = await writer.FlushAsync(); FlushResult flushResult = await writer.FlushAsync().ConfigureAwait(false);
if (flushResult.IsCompleted) if (flushResult.IsCompleted)
{ {
// The PipeReader stopped reading // The PipeReader stopped reading
@ -223,7 +223,7 @@ namespace Emby.Server.Implementations.HttpServer
if (info.MessageType.Equals("KeepAlive", StringComparison.Ordinal)) if (info.MessageType.Equals("KeepAlive", StringComparison.Ordinal))
{ {
await SendKeepAliveResponse(); await SendKeepAliveResponse().ConfigureAwait(false);
} }
else else
{ {