Minor swarm fixes

- Fix double checking serversUpdatedTcs
- Fix unregistering causing 500 errors from remote abort failures.
This commit is contained in:
Jordan Brown
2020-12-30 15:11:14 -05:00
parent 6c8dc87c4a
commit 1ec16a22bd
@@ -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>