From 2f8e566f130931c3d9840ebdc723b402fb1d1c3f Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 17 Nov 2023 23:21:50 -0500 Subject: [PATCH] Do not use `AdvancedWatchdog` features for non-Byond engines --- .../Components/Watchdog/AdvancedWatchdog.cs | 6 ++++++ .../Components/Watchdog/WindowsWatchdog.cs | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/AdvancedWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/AdvancedWatchdog.cs index 9d8f8cbda8..82de605559 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/AdvancedWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/AdvancedWatchdog.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using Tgstation.Server.Api.Models; using Tgstation.Server.Api.Models.Internal; using Tgstation.Server.Host.Components.Chat; using Tgstation.Server.Host.Components.Deployment; @@ -290,6 +291,11 @@ namespace Tgstation.Server.Host.Components.Watchdog throw new InvalidOperationException("Expected pendingSwappable to be null!"); Logger.LogTrace("Prep for server launch"); + if (dmbToUse.EngineVersion.Engine.Value != EngineType.Byond) + { + Logger.LogDebug("Not using SwappableDmbProvider for engine type {engineType}", dmbToUse.EngineVersion.Engine.Value); + return dmbToUse; + } ActiveSwappable = CreateSwappableDmbProvider(dmbToUse); try diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs index 8180630ea4..cd8f0b4525 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using Tgstation.Server.Api.Models; using Tgstation.Server.Api.Models.Internal; using Tgstation.Server.Host.Components.Chat; using Tgstation.Server.Host.Components.Deployment; @@ -80,6 +81,12 @@ namespace Tgstation.Server.Host.Components.Watchdog /// protected override async ValueTask ApplyInitialDmb(CancellationToken cancellationToken) { + if (Server.EngineVersion.Engine.Value != EngineType.Byond) + { + Logger.LogTrace("Not setting InitialDmb for engine type {engineType}", Server.EngineVersion.Engine.Value); + return; + } + Server.ReattachInformation.InitialDmb = await DmbFactory.FromCompileJob(Server.CompileJob, cancellationToken); }