From ea49ec0da2101c20225eb8b4ae94e4d9673f0ce4 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Mon, 13 Nov 2023 16:06:28 -0500
Subject: [PATCH] A bunch of additional logging in pursuit of #1713

---
 src/Tgstation.Server.Host/Jobs/JobService.cs       | 10 +++++++++-
 .../Jobs/JobsHubGroupMapper.cs                     |  2 ++
 .../Utils/SignalR/ComprehensiveHubContext.cs       | 14 +++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Tgstation.Server.Host/Jobs/JobService.cs b/src/Tgstation.Server.Host/Jobs/JobService.cs
index c74204cd8e..87387c60a9 100644
--- a/src/Tgstation.Server.Host/Jobs/JobService.cs
+++ b/src/Tgstation.Server.Host/Jobs/JobService.cs
@@ -369,6 +369,8 @@ namespace Tgstation.Server.Host.Jobs
 
 					var hubUpdatesTask = Task.CompletedTask;
 					var result = false;
+					var firstLogHappened = false;
+					var hubGroupName = JobsHub.HubGroupName(job);
 
 					Stopwatch stopwatch = null;
 					void QueueHubUpdate(JobResponse update, bool final)
@@ -380,10 +382,16 @@ namespace Tgstation.Server.Host.Jobs
 							{
 								await currentUpdatesTask;
 
+								if (!firstLogHappened)
+								{
+									logger.LogTrace("Sending updates for job {id} to hub group {group}", update.Id.Value, hubGroupName);
+									firstLogHappened = true;
+								}
+
 								// DCT: Cancellation token is for job, operation should always run
 								await hub
 									.Clients
-									.Group(JobsHub.HubGroupName(job))
+									.Group(hubGroupName)
 									.ReceiveJobUpdate(update, CancellationToken.None);
 							}
 
diff --git a/src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs b/src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs
index 719138e6ad..be1b14a502 100644
--- a/src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs
+++ b/src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs
@@ -117,6 +117,8 @@ namespace Tgstation.Server.Host.Jobs
 		{
 			ArgumentNullException.ThrowIfNull(authenticationContext);
 
+			logger.LogTrace("MapConnectionGroups UID: {uid}", authenticationContext.User.Id.Value);
+
 			List<long> permedInstanceIds = null;
 			await databaseContextFactory.UseContext(
 				async databaseContext =>
diff --git a/src/Tgstation.Server.Host/Utils/SignalR/ComprehensiveHubContext.cs b/src/Tgstation.Server.Host/Utils/SignalR/ComprehensiveHubContext.cs
index 3892aad56c..1f09be3571 100644
--- a/src/Tgstation.Server.Host/Utils/SignalR/ComprehensiveHubContext.cs
+++ b/src/Tgstation.Server.Host/Utils/SignalR/ComprehensiveHubContext.cs
@@ -85,9 +85,17 @@ namespace Tgstation.Server.Host.Utils.SignalR
 
 			var mappingTask = OnConnectionMapGroups?.Invoke(
 				authenticationContext,
-				mappedGroups => Task.WhenAll(
-					mappedGroups.Select(
-						group => hub.Groups.AddToGroupAsync(context.ConnectionId, group, cancellationToken))),
+				mappedGroups =>
+				{
+					mappedGroups = mappedGroups.ToList();
+					logger.LogTrace(
+						"Mapping connection ID {connectionId} with groups: {mappedGroups}",
+						context.ConnectionId,
+						String.Join(", ", mappedGroups));
+					return Task.WhenAll(
+						mappedGroups.Select(
+							group => hub.Groups.AddToGroupAsync(context.ConnectionId, group, cancellationToken)));
+				},
 				cancellationToken)
 				?? ValueTask.CompletedTask;
 			userConnections.AddOrUpdate(