Merge branch 'master' into dev

src/Tgstation.Server.Host/Components/Chat/ChatManager.cs

@@ -470,6 +470,7 @@ namespace Tgstation.Server.Host.Components.Chat
 		/// <inheritdoc />
 		public async Task DeleteConnection(long connectionId, CancellationToken cancellationToken)
 		{
+			logger.LogTrace("DeleteConnection {connectionId}", connectionId);
 			var provider = await RemoveProviderChannels(connectionId, true, cancellationToken);
 			if (provider != null)
 				try
@@ -480,6 +481,8 @@ namespace Tgstation.Server.Host.Components.Chat
 				{
 					await provider.DisposeAsync();
 				}
+			else
+				logger.LogTrace("DeleteConnection: ID {connectionId} doesn't exist!", connectionId);
 		}
 
 		/// <inheritdoc />

src/Tgstation.Server.Host/Components/Chat/Providers/DiscordForwardingResponder.cs

@@ -31,6 +31,6 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 		public Task<Result> RespondAsync(IMessageCreate gatewayEvent, CancellationToken ct) => targetResponder.RespondAsync(gatewayEvent, ct);
 
 		/// <inheritdoc />
-		public Task<Result> RespondAsync(IReady gatewayEvent, CancellationToken ct = default) => targetResponder.RespondAsync(gatewayEvent, ct);
+		public Task<Result> RespondAsync(IReady gatewayEvent, CancellationToken ct) => targetResponder.RespondAsync(gatewayEvent, ct);
 	}
 }

src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs

@@ -197,8 +197,9 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 		{
 			await base.DisposeAsync();
 			await serviceProvider.DisposeAsync();
+			Logger.LogTrace("ServiceProvider disposed");
 
-			// this line is purely here to shutup CA2213
+			// this line is purely here to shutup CA2213. It should always be null
 			gatewayCts?.Dispose();
 		}
 

src/Tgstation.Server.Host/Components/Chat/Providers/Provider.cs

@@ -224,6 +224,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 		/// <returns>A <see cref="Task"/> representing the running operation.</returns>
 		Task StopReconnectionTimer()
 		{
+			Logger.LogTrace("StopReconnectionTimer");
 			lock (reconnectTaskLock)
 				if (reconnectCts != null)
 				{
@@ -234,6 +235,8 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 					this.reconnectTask = null;
 					return reconnectTask;
 				}
+				else
+					Logger.LogTrace("Timer wasn't running");
 
 			return Task.CompletedTask;
 		}