From 28456b843b88df4aff263f4375c7fe7d2c515491 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 18 Sep 2018 20:46:13 -0400 Subject: [PATCH 1/2] Fix ActiveCompileJob only being set if watchdog is running --- src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs index c13ec7e820..c9f2520e6d 100644 --- a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs +++ b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs @@ -124,7 +124,7 @@ namespace Tgstation.Server.Host.Controllers if (revision) { - result.ActiveCompileJob = dd.ActiveCompileJob?.ToApi(); + result.ActiveCompileJob = (dd.ActiveCompileJob ?? instance.LatestCompileJob())?.ToApi(); var compileJob = instance.LatestCompileJob(); result.StagedCompileJob = compileJob?.ToApi(); } From 7474bd7d0aed9413483ca886897f2b82825287e5 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 18 Sep 2018 20:47:37 -0400 Subject: [PATCH 2/2] Fix StagedCompileJob being the same as the ActiveCompileJob --- .../Controllers/DreamDaemonController.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs index c9f2520e6d..af3bb8cc15 100644 --- a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs +++ b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs @@ -124,9 +124,10 @@ namespace Tgstation.Server.Host.Controllers if (revision) { - result.ActiveCompileJob = (dd.ActiveCompileJob ?? instance.LatestCompileJob())?.ToApi(); - var compileJob = instance.LatestCompileJob(); - result.StagedCompileJob = compileJob?.ToApi(); + var latestCompileJob = instance.LatestCompileJob(); + result.ActiveCompileJob = (dd.ActiveCompileJob ?? latestCompileJob)?.ToApi(); + if (latestCompileJob?.Id != result.ActiveCompileJob?.Id) + result.StagedCompileJob = latestCompileJob?.ToApi(); } return Json(result);