cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 16:39:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shutdown event sending

Browse Source
This commit is contained in:
Jordan Brown
2020-05-12 22:37:35 -04:00
parent 88598aab76
commit f0ccb25e54
1 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+28 -34
View File
@@ -230,10 +230,11 @@ namespace Tgstation.Server.Host.Components.Watchdog
var eventTask = HandleEvent(releaseServers ? EventType.WatchdogDetach : EventType.WatchdogShutdown, null, cancellationToken);
var chatTask = announce ? Chat.SendWatchdogMessage("Shutting down...", false, cancellationToken) : Task.CompletedTask;
await StopMonitor().ConfigureAwait(false);
await eventTask.ConfigureAwait(false);
await StopMonitor().ConfigureAwait(false);
DisposeAndNullControllers();
LastLaunchParameters = null;
@@ -401,6 +402,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
var wasRunning = !monitorTask.IsCompleted;
monitorCts.Cancel();
await monitorTask.ConfigureAwait(false);
Logger.LogTrace("Stopped Monitor");
monitorCts.Dispose();
monitorTask = null;
monitorCts = null;
@@ -717,44 +719,36 @@ namespace Tgstation.Server.Host.Components.Watchdog
if (!Running)
return true;
CombinedTopicResponse result;
using (await SemaphoreSlimContext.Lock(Semaphore, cancellationToken).ConfigureAwait(false))
{
if (!Running)
return true;
var notification = new EventNotification(eventType, parameters);
var notification = new EventNotification(eventType, parameters);
var activeServer = GetActiveController();
var activeServer = GetActiveController();
// Server may have ended
if (activeServer == null)
return true;
result = await activeServer.SendCommand(
new TopicParameters(notification),
cancellationToken)
.ConfigureAwait(false);
}
if (result?.InteropResponse?.ChatResponses == null)
// Server may have ended
if (activeServer == null)
return true;
await Task.WhenAll(
result.InteropResponse.ChatResponses.Select(
x => Chat.SendMessage(
x.Text,
x.ChannelIds
.Select(channelIdString =>
{
if (UInt64.TryParse(channelIdString, out var channelId))
return (ulong?)channelId;
var result = await activeServer.SendCommand(
new TopicParameters(notification),
cancellationToken)
.ConfigureAwait(false);
return null;
})
.Where(nullableChannelId => nullableChannelId.HasValue)
.Select(nullableChannelId => nullableChannelId.Value),
cancellationToken))).ConfigureAwait(false);
if (result?.InteropResponse?.ChatResponses != null)
await Task.WhenAll(
result.InteropResponse.ChatResponses.Select(
x => Chat.SendMessage(
x.Text,
x.ChannelIds
.Select(channelIdString =>
{
if (UInt64.TryParse(channelIdString, out var channelId))
return (ulong?)channelId;
return null;
})
.Where(nullableChannelId => nullableChannelId.HasValue)
.Select(nullableChannelId => nullableChannelId.Value),
cancellationToken)))
.ConfigureAwait(false);
return true;
}