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

DreamDaemonController fixes

Browse Source
This commit is contained in:
Jordan Brown
2018-08-18 01:31:09 -04:00
parent e0d7bec4f3
commit 2945713386
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
+15 -15
View File
@@ -104,14 +104,14 @@ namespace Tgstation.Server.Host.Controllers
var llp = dd.LastLaunchParameters;
var rstate = dd.RebootState;
result.AutoStart = settings.AutoStart;
result.CurrentPort = alphaActive ? llp.PrimaryPort : llp.SecondaryPort;
result.CurrentSecurity = llp.SecurityLevel;
result.CurrentAllowWebclient = llp.AllowWebClient;
result.PrimaryPort = dd.ActiveLaunchParameters.PrimaryPort;
result.AllowWebClient = dd.ActiveLaunchParameters.AllowWebClient;
result.CurrentPort = alphaActive ? llp?.PrimaryPort : llp?.SecondaryPort;
result.CurrentSecurity = llp?.SecurityLevel;
result.CurrentAllowWebclient = llp?.AllowWebClient;
result.PrimaryPort = settings.PrimaryPort;
result.AllowWebClient = settings.AllowWebClient;
result.Running = dd.Running;
result.SecondaryPort = llp.SecondaryPort;
result.SecurityLevel = llp.SecurityLevel;
result.SecondaryPort = settings.SecondaryPort;
result.SecurityLevel = settings.SecurityLevel;
result.SoftRestart = rstate == RebootState.Restart;
result.SoftShutdown = rstate == RebootState.Shutdown;
};
@@ -167,14 +167,14 @@ namespace Tgstation.Server.Host.Controllers
var oldSoftRestart = current.SoftRestart;
var oldSoftShutdown = current.SoftShutdown;
if (!CheckModified(x => x.AllowWebClient, DreamDaemonRights.SetWebClient)
|| !CheckModified(x => x.AutoStart, DreamDaemonRights.SetAutoStart)
|| !CheckModified(x => x.PrimaryPort, DreamDaemonRights.SetPorts)
|| !CheckModified(x => x.SecondaryPort, DreamDaemonRights.SetPorts)
|| !CheckModified(x => x.SecurityLevel, DreamDaemonRights.SetSecurity)
|| !CheckModified(x => x.SoftRestart, DreamDaemonRights.SoftRestart)
|| !CheckModified(x => x.SoftShutdown, DreamDaemonRights.SoftShutdown)
|| !CheckModified(x => x.StartupTimeout, DreamDaemonRights.SetStartupTimeout))
if (CheckModified(x => x.AllowWebClient, DreamDaemonRights.SetWebClient)
|| CheckModified(x => x.AutoStart, DreamDaemonRights.SetAutoStart)
|| CheckModified(x => x.PrimaryPort, DreamDaemonRights.SetPorts)
|| CheckModified(x => x.SecondaryPort, DreamDaemonRights.SetPorts)
|| CheckModified(x => x.SecurityLevel, DreamDaemonRights.SetSecurity)
|| CheckModified(x => x.SoftRestart, DreamDaemonRights.SoftRestart)
|| CheckModified(x => x.SoftShutdown, DreamDaemonRights.SoftShutdown)
|| CheckModified(x => x.StartupTimeout, DreamDaemonRights.SetStartupTimeout))
return Forbid();
if (current.SecurityLevel == DreamDaemonSecurity.Ultrasafe)