From 0eb4cddc54c3b499c901bdd806b7b2aaeb5060e2 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Thu, 11 Apr 2024 10:55:39 +0200 Subject: feat(bg-jobs): support multiple arguments in cron.php and occ:background-job:worker for the job class list Signed-off-by: Julien Veyssier --- cron.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'cron.php') diff --git a/cron.php b/cron.php index d0a8b770dfc..9b0489653ef 100644 --- a/cron.php +++ b/cron.php @@ -62,10 +62,10 @@ try { Run the background job routine Usage: - php -f cron.php -- [-h] [] + php -f cron.php -- [-h] [...] Arguments: - job-classes Optional job class comma-separated list to only run those jobs + job-classes Optional job class list to only run those jobs Options: -h, --help Display this help message' . PHP_EOL; @@ -175,16 +175,10 @@ Options: $endTime = time() + 14 * 60; $executedJobs = []; - // a specific job class list can optionally be given as first argument - // only keep non-empty strings - $jobClasses = isset($argv[1]) - ? array_filter( - explode(',', $argv[1]), - static function (string $jobClass) { - return strlen($jobClass) > 0; - } - ) - : null; + // a specific job class list can optionally be given as argument + $jobClasses = array_slice($argv, 1); + $jobClasses = empty($jobClasses) ? null : $jobClasses; + while ($job = $jobList->getNext($onlyTimeSensitive, $jobClasses)) { if (isset($executedJobs[$job->getId()])) { $jobList->unlockJob($job); -- cgit v1.2.3