From a84abee4aa74efcd783e6cd33cc2b26740255248 Mon Sep 17 00:00:00 2001 From: Dominion Date: Fri, 26 May 2023 15:33:12 -0400 Subject: [PATCH] Fix issue cancelling Provider reconnection loop while a connection job was running --- .../Components/Chat/Providers/Provider.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/Provider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/Provider.cs index e13f46ade8..f9ef3396c6 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/Provider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/Provider.cs @@ -312,16 +312,18 @@ namespace Tgstation.Server.Host.Components.Chat.Providers await jobManager.WaitForJobCompletion(job, null, cancellationToken, default); } } - catch (OperationCanceledException) + catch (OperationCanceledException e) { - break; + Logger.LogTrace(e, "ReconnectionLoop cancelled"); } catch (Exception e) { Logger.LogError(e, "Error reconnecting!"); } } - while (true); + while (!cancellationToken.IsCancellationRequested); + + Logger.LogTrace("ReconnectionLoop exiting..."); } } }