diff --git a/README.md b/README.md index 77c2286a73..c8b6b54c27 100644 --- a/README.md +++ b/README.md @@ -124,8 +124,6 @@ Create an `appsettings.Production.yml` file next to `appsettings.yml`. This will - `Session:LowPriorityDeploymentProcesses `: Boolean controlling if DreamMaker and API validation DreamDaemon instances get set to below normal priority processes. -- `Session:DoNotUseDDExe`: Boolean controlling if dd.exe, the CLI DreamDaemon for Windows released in BYOND 515.1598, is NOT used (by default it is when available). - - `FileLogging:Directory`: Override the default directory where server logs are stored. Default is C:/ProgramData/tgstation-server/logs on Windows, /usr/share/tgstation-server/logs otherwise - `FileLogging:LogLevel`: Can be one of `Trace`, `Debug`, `Information`, `Warning`, `Error`, or `Critical`. Restricts what is put into the log files. Currently `Debug` is reccommended for help with error reporting. diff --git a/src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs b/src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs index c2dbc34076..e18487ee1e 100644 --- a/src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs +++ b/src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs @@ -121,7 +121,7 @@ namespace Tgstation.Server.Host.Components.Byond { ArgumentNullException.ThrowIfNull(version); - supportsCli = !sessionConfiguration.DoNotUseDDExe && version >= DDExeVersion; + supportsCli = version >= DDExeVersion; supportsMapThreads = version >= MapThreadsVersion; return supportsCli ? "dd.exe" : "dreamdaemon.exe"; } diff --git a/src/Tgstation.Server.Host/Configuration/SessionConfiguration.cs b/src/Tgstation.Server.Host/Configuration/SessionConfiguration.cs index 6260b9aae0..9d0a18f656 100644 --- a/src/Tgstation.Server.Host/Configuration/SessionConfiguration.cs +++ b/src/Tgstation.Server.Host/Configuration/SessionConfiguration.cs @@ -24,10 +24,5 @@ /// If the deployment DreamMaker and DreamDaemon instances are set to be below normal priority processes. /// public bool LowPriorityDeploymentProcesses { get; set; } - - /// - /// If dd.exe should not be used if it is available. - /// - public bool DoNotUseDDExe { get; set; } } } diff --git a/src/Tgstation.Server.Host/appsettings.yml b/src/Tgstation.Server.Host/appsettings.yml index 9c3f10eb12..98e98062a8 100644 --- a/src/Tgstation.Server.Host/appsettings.yml +++ b/src/Tgstation.Server.Host/appsettings.yml @@ -16,7 +16,6 @@ General: Session: HighPriorityLiveDreamDaemon: false LowPriorityDeploymentProcesses: true - DoNotUseDDExe: false FileLogging: Directory: Disable: false diff --git a/tests/Tgstation.Server.Tests/Live/LiveTestingServer.cs b/tests/Tgstation.Server.Tests/Live/LiveTestingServer.cs index bd51817853..2d3a5b5ca5 100644 --- a/tests/Tgstation.Server.Tests/Live/LiveTestingServer.cs +++ b/tests/Tgstation.Server.Tests/Live/LiveTestingServer.cs @@ -49,7 +49,7 @@ namespace Tgstation.Server.Tests.Live SerilogContextHelper.AddSwarmNodeIdentifierToTemplate(); } - public LiveTestingServer(SwarmConfiguration swarmConfiguration, bool enableOAuth, ushort port = 15010, bool disableDDExe = false) + public LiveTestingServer(SwarmConfiguration swarmConfiguration, bool enableOAuth, ushort port = 15010) { Assert.IsTrue(port >= 10000); // for testing bridge request limit Directory = Environment.GetEnvironmentVariable("TGS_TEST_TEMP_DIRECTORY"); @@ -114,7 +114,6 @@ namespace Tgstation.Server.Tests.Live "General:ByondTopicTimeout=3000", $"Session:HighPriorityLiveDreamDaemon={HighPriorityDreamDaemon}", $"Session:LowPriorityDeploymentProcesses={LowPriorityDeployments}", - $"Session:DoNotUseDDExe={disableDDExe}", }; swarmArgs = new List();