From 4eb4191843577e16c9b72d857d2c309123d38e21 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sat, 8 Apr 2023 10:49:59 +0200 Subject: [PATCH] don't run cron tasks if requirements return non-success; fixes #1122 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cli/MasterCron.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/Froxlor/Cli/MasterCron.php b/lib/Froxlor/Cli/MasterCron.php index 490aa544..72d43f70 100644 --- a/lib/Froxlor/Cli/MasterCron.php +++ b/lib/Froxlor/Cli/MasterCron.php @@ -62,6 +62,11 @@ final class MasterCron extends CliCommand $result = self::SUCCESS; $result = $this->validateRequirements($input, $output); + if ($result != self::SUCCESS) { + // requirements failed, exit + return $result; + } + $jobs = $input->getArgument('job'); // handle force option @@ -111,8 +116,8 @@ final class MasterCron extends CliCommand ]); $this->cronLog->setCronDebugFlag(defined('CRON_DEBUG_FLAG')); - // check whether there are actual tasks to perform by 'tasks'-cron so - // we dont regenerate files unnecessarily + // check whether there are actual tasks to perform by 'tasks'-cron, so + // we don't regenerate files unnecessarily $tasks_cnt_stmt = Database::query("SELECT COUNT(*) as jobcnt FROM `panel_tasks`"); $tasks_cnt = $tasks_cnt_stmt->fetch(PDO::FETCH_ASSOC);