From 1ec16a22bdb56e0f151c7c8463283e933df719b3 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Wed, 30 Dec 2020 15:11:14 -0500
Subject: [PATCH] Minor swarm fixes

- Fix double checking serversUpdatedTcs
- Fix unregistering causing 500 errors from remote abort failures.
---
 .../Swarm/SwarmService.cs                      | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Tgstation.Server.Host/Swarm/SwarmService.cs b/src/Tgstation.Server.Host/Swarm/SwarmService.cs
index b69a1a1229..306f558a66 100644
--- a/src/Tgstation.Server.Host/Swarm/SwarmService.cs
+++ b/src/Tgstation.Server.Host/Swarm/SwarmService.cs
@@ -282,8 +282,20 @@ namespace Tgstation.Server.Host.Swarm
 					SwarmConstants.UpdateRoute,
 					null);
 
-				using var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
-				response.EnsureSuccessStatusCode();
+				try
+				{
+					using var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
+					response.EnsureSuccessStatusCode();
+				}
+				catch (Exception ex)
+				{
+					logger.LogWarning(
+						ex,
+						"Unable to set remote abort to {0}!",
+						swarmController
+							? $"node {swarmServer.Identifier}"
+							: "controller");
+				}
 			}
 
 			Task task;
@@ -709,9 +721,9 @@ namespace Tgstation.Server.Host.Swarm
 		{
 			var currentTcs = serversUpdatedTcs;
 			serversDirty = true;
+			serversUpdatedTcs = new TaskCompletionSource<object>();
 			if (currentTcs.TrySetResult(null))
 				logger.LogTrace("Server list is dirty!");
-			serversUpdatedTcs = new TaskCompletionSource<object>();
 		}
 
 		/// <summary>