From 4b934384b7288f5a5b9e6d3bb7462b0a68063a6b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 30 Jul 2020 13:40:29 -0400 Subject: [PATCH] Maybe fix other sleep_offline issues --- .../Components/Chat/Providers/DiscordProvider.cs | 4 +++- .../Components/Session/SessionController.cs | 3 ++- tests/DMAPI/BasicOperation/Test.dm | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index b115edf45f..a660d927d7 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -266,8 +266,10 @@ namespace Tgstation.Server.Host.Components.Chat.Providers }) .ConfigureAwait(false); } - catch (Exception e) when (!(e is OperationCanceledException)) + catch (Exception e) { + if (e is OperationCanceledException) + cancellationToken.ThrowIfCancellationRequested(); Logger.LogWarning(e, "Error sending discord message!"); } } diff --git a/src/Tgstation.Server.Host/Components/Session/SessionController.cs b/src/Tgstation.Server.Host/Components/Session/SessionController.cs index c5c10b6719..5711b7b587 100644 --- a/src/Tgstation.Server.Host/Components/Session/SessionController.cs +++ b/src/Tgstation.Server.Host/Components/Session/SessionController.cs @@ -370,7 +370,8 @@ namespace Tgstation.Server.Host.Components.Session await chat.SendMessage( parameters.ChatMessage.Text, parameters.ChatMessage.ChannelIds.Select(UInt64.Parse), - cancellationToken).ConfigureAwait(false); + cancellationToken) + .ConfigureAwait(false); break; case BridgeCommandType.Prime: var oldPrimeTcs = primeTcs; diff --git a/tests/DMAPI/BasicOperation/Test.dm b/tests/DMAPI/BasicOperation/Test.dm index 0fc07d72f9..e09518782f 100644 --- a/tests/DMAPI/BasicOperation/Test.dm +++ b/tests/DMAPI/BasicOperation/Test.dm @@ -1,5 +1,6 @@ /world/New() log << "About to call TgsNew()" + sleep_offline = FALSE TgsNew(minimum_required_security_level = TGS_SECURITY_SAFE) log << "About to call StartAsync()" StartAsync()