Revert the config change for not using DD.exe

It presents complications with pre-existing TGS setup firewall rules.
This commit is contained in:
Dominion
2023-06-15 03:53:10 -04:00
parent d441f50d9a
commit fb47ad5ba6
5 changed files with 2 additions and 11 deletions
-2
View File
@@ -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.
@@ -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";
}
@@ -24,10 +24,5 @@
/// If the deployment DreamMaker and DreamDaemon instances are set to be below normal priority processes.
/// </summary>
public bool LowPriorityDeploymentProcesses { get; set; }
/// <summary>
/// If dd.exe should not be used if it is available.
/// </summary>
public bool DoNotUseDDExe { get; set; }
}
}
@@ -16,7 +16,6 @@ General:
Session:
HighPriorityLiveDreamDaemon: false
LowPriorityDeploymentProcesses: true
DoNotUseDDExe: false
FileLogging:
Directory:
Disable: false
@@ -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<string>();