beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved console disposing and closing

Browse source
This commit is contained in:
Marcel Baumgartner 2024-04-17 17:03:18 +02:00
parent fd01787dfb
commit 01729b982d
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Moonlight/Features/Servers/Helpers/ServerConsole.cs
View file

@ -99,6 +99,9 @@ public class ServerConsole : IDisposable
}
catch (Exception e)
{
if(Cancellation.IsCancellationRequested)
break;
if (e is WebSocketException)
Logger.Warn($"Lost connection to daemon server websocket: {e.Message}");
else
@ -112,7 +115,6 @@ public class ServerConsole : IDisposable
}
await OnDisconnected.Invoke();
await WebsocketStream.Close();
}
public async Task Close()
@ -120,8 +122,8 @@ public class ServerConsole : IDisposable
if(!Cancellation.IsCancellationRequested)
Cancellation.Cancel();
if(WebsocketStream != null)
await WebsocketStream.Close();
if (WebSocket.State == WebSocketState.Open)
await WebSocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, null, CancellationToken.None);
}
private string[] GetMessageCache()
@ -134,9 +136,15 @@ public class ServerConsole : IDisposable
{
MessageCache.Clear();
await OnDisconnected.ClearSubscribers();
await OnStateChange.ClearSubscribers();
await OnStatsChange.ClearSubscribers();
await OnNewMessage.ClearSubscribers();
if (WebSocket.State == WebSocketState.Open)
await WebsocketStream.Close();
await WebSocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, null, CancellationToken.None);
WebSocket.Dispose();
}
}