From dc24a1071f7b2d82a83f1867209f94252877bd63 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Thu, 6 Feb 2025 10:50:40 +0100 Subject: [PATCH] remove workaround --- MareSynchronos/WebAPI/SignalR/ApiController.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/MareSynchronos/WebAPI/SignalR/ApiController.cs b/MareSynchronos/WebAPI/SignalR/ApiController.cs index 6d6a0ff..62b7237 100644 --- a/MareSynchronos/WebAPI/SignalR/ApiController.cs +++ b/MareSynchronos/WebAPI/SignalR/ApiController.cs @@ -39,7 +39,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM private HubConnection? _mareHub; private ServerState _serverState; private CensusUpdateMessage? _lastCensus; - private readonly SemaphoreSlim _zoneSwitchSemaphore = new(1, 1); public ApiController(ILogger logger, HubFactory hubFactory, DalamudUtilService dalamudUtil, PairManager pairManager, ServerConfigurationManager serverManager, MareMediator mediator, @@ -61,8 +60,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM Mediator.Subscribe(this, (msg) => _ = CyclePauseAsync(msg.UserData)); Mediator.Subscribe(this, (msg) => _lastCensus = msg); Mediator.Subscribe(this, (msg) => _ = PauseAsync(msg.UserData)); - Mediator.Subscribe(this, (msg) => _zoneSwitchSemaphore.Wait()); - Mediator.Subscribe(this, (msg) => _zoneSwitchSemaphore.Release()); ServerState = ServerState.Offline; @@ -366,7 +363,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM _healthCheckTokenSource?.Cancel(); _ = Task.Run(async () => await StopConnectionAsync(ServerState.Disconnected).ConfigureAwait(false)); - _zoneSwitchSemaphore.Dispose(); _connectionCancellationTokenSource?.Cancel(); } @@ -536,13 +532,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM private async Task RefreshTokenAsync(CancellationToken ct) { - int zoneSwitchWaitAttempts = 0; - while (_zoneSwitchSemaphore.CurrentCount == 0 && zoneSwitchWaitAttempts <= 15) - { - Logger.LogTrace("Refresh Token - Waiting for Zone Switch Semaphore, attempt {attempt}", zoneSwitchWaitAttempts++); - await Task.Delay(TimeSpan.FromSeconds(1), ct).ConfigureAwait(false); - } - Logger.LogDebug("Checking token"); bool requireReconnect = false;