diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs index e537489a9..9238fec6e 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs @@ -88,18 +88,20 @@ public class DataStreamWebSocketServer : IDisposable, IAsyncDisposable { ArgumentNullException.ThrowIfNull(req.Id); ArgumentException.ThrowIfNullOrEmpty(req.Method); var subId = req.Params?.SubscriptionId ?? string.Empty; - disposeSubscription(subId); + if (!disposeSubscription(subId)) { + logger.LogInformation("Unable to dispose subscription. Subscription with id {Id} not found.", subId); + } await sendSubscriptionStatus(req.Id.Value, subId, "unsubscribe", SubscriptionStatus.Unsubscribed, cancellationToken); } - void disposeSubscription(string subId) { + bool disposeSubscription(string subId) { if (!subscriptions.TryGetValue(subId, out var sub)) { - logger.LogInformation("Unable to dispose subscription. Subscription with id {Id} not found.", subId); - return; + return false; } logger.LogInformation("Disposing subscription with id {Id}", subId); sub.Dispose(); subscriptions.Remove(subId); + return true; } Task sendSubscriptionStatus(JsonRpcId reqId, string subId, string method, SubscriptionStatus status, CancellationToken cancellationToken) {