From f39834bdaaa30f039b0ae5055857fd01d8d14601 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 28 Mar 2020 12:07:28 -0400 Subject: [PATCH] Temporarily hide the existence of the WindowsWatchdog for the 4.0.2.0 release --- src/Tgstation.Server.Host/Core/SetupWizard.cs | 4 ++-- src/Tgstation.Server.Host/appsettings.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Core/SetupWizard.cs b/src/Tgstation.Server.Host/Core/SetupWizard.cs index 53a7708d58..08c410f54f 100644 --- a/src/Tgstation.Server.Host/Core/SetupWizard.cs +++ b/src/Tgstation.Server.Host/Core/SetupWizard.cs @@ -532,8 +532,8 @@ namespace Tgstation.Server.Host.Core newGeneralConfiguration.GitHubAccessToken = null; newGeneralConfiguration.UseExperimentalWatchdog = await PromptYesNo("Use the experimental watchdog (NOT RECOMMENDED)? (y/n): ", cancellationToken).ConfigureAwait(false); - if (!newGeneralConfiguration.UseExperimentalWatchdog && platformIdentifier.IsWindows) - newGeneralConfiguration.UseBasicWatchdogOnWindows = !await PromptYesNo("Use the TGS3 style Windows watchdog (RECOMMENDED)? (y/n): ", cancellationToken).ConfigureAwait(false); + + newGeneralConfiguration.UseBasicWatchdogOnWindows = true; return newGeneralConfiguration; } diff --git a/src/Tgstation.Server.Host/appsettings.json b/src/Tgstation.Server.Host/appsettings.json index cf71daf70c..877ed3e523 100644 --- a/src/Tgstation.Server.Host/appsettings.json +++ b/src/Tgstation.Server.Host/appsettings.json @@ -6,7 +6,7 @@ "ByondTopicTimeout": 5000, "RestartTimeout": 10000, "UseExperimentalWatchdog": false, - "UseBasicWatchdogOnWindows": false + "UseBasicWatchdogOnWindows": true }, "FileLogging": { "Directory": null,