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

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

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

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