From 312b0b7e7670a6cd97a4d6772d5cf0e75ae6e755 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 1 Aug 2024 17:44:36 -0700 Subject: [PATCH] server status page: show remote scheduler correctly The scheduler is a CGI program, not a daemon; it doesn't have a PID file. So the only way we can see if it's 'running' is to check the 'stop_sched' trigger file. Do this whether the scheduler is local or remote. --- html/user/server_status.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/html/user/server_status.php b/html/user/server_status.php index eafc0591d2..7a378c54de 100644 --- a/html/user/server_status.php +++ b/html/user/server_status.php @@ -356,17 +356,13 @@ function get_daemon_status() { $have_remote = true; } - // Scheduler is a daemon too - // - if ($sched_host == $main_host) { - $y = new StdClass; - $y->cmd = "Scheduler"; - $y->host = $sched_host; - $y->status = !file_exists("../../stop_sched");; - $local_daemons[] = $y; - } else { - $have_remote = true; - } + // the scheduler is a CGI program, not a daemon; + // it doesn't have a PID. + $y = new StdClass; + $y->cmd = "Scheduler"; + $y->host = $sched_host; + $y->status = !file_exists("../../stop_sched");; + $local_daemons[] = $y; foreach ($daemons->daemon as $d) { if ((int)$d->disabled != 0) {