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

Remove concept of "admin" watchdog chat broadcasts

Browse Source
This commit is contained in:
Jordan Brown
2020-08-05 00:14:09 -04:00
parent 843845068a
commit b7e86cf00c
4 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+2 -12
View File
@@ -632,7 +632,7 @@ namespace Tgstation.Server.Host.Components.Chat
}
/// <inheritdoc />
public async Task SendWatchdogMessage(string message, bool adminOnly, CancellationToken cancellationToken)
public async Task SendWatchdogMessage(string message, CancellationToken cancellationToken)
{
List<ulong> wdChannels = null;
message = String.Format(CultureInfo.InvariantCulture, "WD: {0}", message);
@@ -644,17 +644,7 @@ namespace Tgstation.Server.Host.Components.Chat
// so it doesn't change while we're using it
lock (mappedChannels)
{
if (adminOnly)
{
wdChannels = mappedChannels.Where(x => x.Value.IsAdminChannel).Select(x => x.Key).ToList();
if (wdChannels.Count == 0)
adminOnly = false;
}
if (!adminOnly)
wdChannels = mappedChannels.Where(x => x.Value.IsWatchdogChannel).Select(x => x.Key).ToList();
}
wdChannels = mappedChannels.Where(x => x.Value.IsWatchdogChannel).Select(x => x.Key).ToList();
await SendMessage(message, wdChannels, cancellationToken).ConfigureAwait(false);
}
src/Tgstation.Server.Host/Components/Chat/IChatManager.cs
+1 -2
View File
@@ -56,10 +56,9 @@ namespace Tgstation.Server.Host.Components.Chat
/// Send a chat <paramref name="message"/> to configured watchdog channels
/// </summary>
/// <param name="message">The message being sent</param>
/// <param name="adminOnly">If the message should be sent to admin channels only. If no admin-only channels are configured, it will be sent to the watchdog channels.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
/// <returns>A <see cref="Task"/> representing the running operation</returns>
Task SendWatchdogMessage(string message, bool adminOnly, CancellationToken cancellationToken);
Task SendWatchdogMessage(string message, CancellationToken cancellationToken);
/// <summary>
/// Send the message for a deployment to configured deployment channels.
src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs
-4
View File
@@ -96,7 +96,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
CultureInfo.InvariantCulture,
"Server {0}! Shutting down due to graceful termination request...",
exitWord),
false,
cancellationToken)
.ConfigureAwait(false);
return MonitorAction.Exit;
@@ -107,7 +106,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
CultureInfo.InvariantCulture,
"Server {0}! Rebooting...",
exitWord),
false,
cancellationToken)
.ConfigureAwait(false);
return MonitorAction.Restart;
@@ -132,7 +130,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
// graceful shutdown time
await Chat.SendWatchdogMessage(
"Active server rebooted! Shutting down due to graceful termination request...",
false,
cancellationToken)
.ConfigureAwait(false);
return MonitorAction.Exit;
@@ -257,7 +254,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
if (Server.CompileJob.DMApiVersion == null)
return Chat.SendWatchdogMessage(
"A new deployment has been made but cannot be applied automatically as the currently running server has no DMAPI. Please manually reboot the server to apply the update.",
true,
cancellationToken);
return Server.SetRebootState(Session.RebootState.Restart, cancellationToken);
}
src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+13 -11
View File
@@ -260,7 +260,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
{
var eventTask = eventConsumer.HandleEvent(releaseServers ? EventType.WatchdogDetach : EventType.WatchdogShutdown, null, cancellationToken);
var chatTask = announce ? Chat.SendWatchdogMessage("Shutting down...", false, cancellationToken) : Task.CompletedTask;
var chatTask = announce ? Chat.SendWatchdogMessage("Shutting down...", cancellationToken) : Task.CompletedTask;
await eventTask.ConfigureAwait(false);
@@ -305,7 +305,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
case 2:
var message2 = "DEFCON 3: DreamDaemon has missed 2 heartbeats!";
Logger.LogInformation(message2);
await Chat.SendWatchdogMessage(message2, true, cancellationToken).ConfigureAwait(false);
await Chat.SendWatchdogMessage(message2, cancellationToken).ConfigureAwait(false);
break;
case 3:
var actionToTake = shouldShutdown
@@ -313,7 +313,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
: "be restarted";
var message3 = $"DEFCON 2: DreamDaemon has missed 3 heartbeats! If it does not respond to the next one, the watchdog will {actionToTake}!";
Logger.LogWarning(message3);
await Chat.SendWatchdogMessage(message3, false, cancellationToken).ConfigureAwait(false);
await Chat.SendWatchdogMessage(message3, cancellationToken).ConfigureAwait(false);
break;
case 4:
var actionTaken = shouldShutdown
@@ -321,7 +321,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
: "Restarting";
var message4 = $"DEFCON 1: Four heartbeats have been missed! {actionTaken}...";
Logger.LogWarning(message4);
await Chat.SendWatchdogMessage(message4, false, cancellationToken).ConfigureAwait(false);
await Chat.SendWatchdogMessage(message4, cancellationToken).ConfigureAwait(false);
await DisposeAndNullControllers(cancellationToken).ConfigureAwait(false);
return shouldShutdown ? MonitorAction.Exit : MonitorAction.Restart;
default:
@@ -360,7 +360,11 @@ namespace Tgstation.Server.Host.Components.Watchdog
Task announceTask;
if (announce)
{
announceTask = Chat.SendWatchdogMessage(reattachInfo == null ? "Launching..." : "Reattaching...", false, cancellationToken); // simple announce
announceTask = Chat.SendWatchdogMessage(
reattachInfo == null
? "Launching..."
: "Reattaching...",
cancellationToken); // simple announce
if (reattachInfo == null)
announceTask = Task.WhenAll(
eventConsumer.HandleEvent(EventType.WatchdogLaunch, Enumerable.Empty<string>(), cancellationToken),
@@ -390,7 +394,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
{
await originalChatTask.ConfigureAwait(false);
if (announceFailure)
await Chat.SendWatchdogMessage("Startup failed!", false, cancellationToken).ConfigureAwait(false);
await Chat.SendWatchdogMessage("Startup failed!", cancellationToken).ConfigureAwait(false);
}
announceTask = ChainChatTaskWithErrorMessage();
@@ -476,7 +480,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
async Task ChainChatTask()
{
await chatTask.ConfigureAwait(false);
await Chat.SendWatchdogMessage(FailReattachMessage, false, cancellationToken).ConfigureAwait(false);
await Chat.SendWatchdogMessage(FailReattachMessage, cancellationToken).ConfigureAwait(false);
}
await InitControllers(ChainChatTask(), null, cancellationToken).ConfigureAwait(false);
@@ -563,7 +567,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
chatTask = Chat.SendWatchdogMessage(
$"Failed to restart (Attempt: {retryAttempts}), retrying in {retryDelay}s...",
false,
cancellationToken);
await Task.WhenAll(
@@ -706,7 +709,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
: "Shutting down";
var chatTask = Chat.SendWatchdogMessage(
$"Monitor crashed, this should NEVER happen! Please report this, full details in logs! {nextActionMessage}. Error: {e.Message}",
false,
cancellationToken);
if (disposed)
@@ -860,7 +862,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
{
if (!graceful)
{
var chatTask = Chat.SendWatchdogMessage("Manual restart triggered...", false, cancellationToken);
var chatTask = Chat.SendWatchdogMessage("Manual restart triggered...", cancellationToken);
await TerminateNoLock(false, false, cancellationToken).ConfigureAwait(false);
await LaunchNoLock(true, false, true, null, cancellationToken).ConfigureAwait(false);
await chatTask.ConfigureAwait(false);
@@ -937,7 +939,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
{
releaseServers = true;
if (Status == WatchdogStatus.Online)
await Chat.SendWatchdogMessage("Detaching...", false, cancellationToken).ConfigureAwait(false);
await Chat.SendWatchdogMessage("Detaching...", cancellationToken).ConfigureAwait(false);
else
Logger.LogTrace("Not sending detach chat message as status is: {0}", Status);
}