Merge pull request #1228 from tgstation/FixWatchdogShutdownScript [TGSDeploy]

Fix watchdog shutdown script invocation
This commit is contained in:
Jordan Brown
2021-02-11 22:38:59 -05:00
committed by GitHub
2 changed files with 7 additions and 2 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="ControlPanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>4.9.2</TgsCoreVersion>
<TgsCoreVersion>4.9.3</TgsCoreVersion>
<TgsConfigVersion>3.0.0</TgsConfigVersion>
<TgsApiVersion>8.3.0</TgsApiVersion>
<TgsClientVersion>9.2.0</TgsClientVersion>
@@ -267,7 +267,12 @@ namespace Tgstation.Server.Host.Components.Watchdog
return;
if (!graceful)
{
var eventTask = EventConsumer.HandleEvent(releaseServers ? EventType.WatchdogDetach : EventType.WatchdogShutdown, null, cancellationToken);
var eventTask = EventConsumer.HandleEvent(
releaseServers
? EventType.WatchdogDetach
: EventType.WatchdogShutdown,
Enumerable.Empty<string>(),
cancellationToken);
var chatTask = announce ? Chat.QueueWatchdogMessage("Shutting down...", cancellationToken) : Task.CompletedTask;