From edfba7f151a2ef60b73343a29ddbe04df32c0baa Mon Sep 17 00:00:00 2001 From: Kirill Popov Date: Sat, 23 Apr 2022 16:42:37 +0300 Subject: [PATCH] Get not only time-sensitive next job from list but any Before the change webcron used to select **only** time-sensitive tasks. Signed-off-by: Kirill Popov --- cron.php | 2 ++ lib/private/BackgroundJob/JobList.php | 2 +- tests/lib/BackgroundJob/DummyJobList.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cron.php b/cron.php index 5095a2c7574..a58ef2c206f 100644 --- a/cron.php +++ b/cron.php @@ -147,6 +147,7 @@ try { break; } + $logger->debug('CLI cron call has selected job with ID ' . strval($job->getId()), ['app' => 'cron']); $job->execute($jobList, $logger); // clean up after unclean jobs \OC_Util::tearDownFS(); @@ -169,6 +170,7 @@ try { $jobList = \OC::$server->getJobList(); $job = $jobList->getNext(); if ($job != null) { + $logger->debug('WebCron call has selected job with ID ' . strval($job->getId()), ['app' => 'cron']); $job->execute($jobList, $logger); $jobList->setLastJob($job); } diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php index 21af79c4686..fe65a1879bc 100644 --- a/lib/private/BackgroundJob/JobList.php +++ b/lib/private/BackgroundJob/JobList.php @@ -203,7 +203,7 @@ class JobList implements IJobList { * @param bool $onlyTimeSensitive * @return IJob|null */ - public function getNext(bool $onlyTimeSensitive = true): ?IJob { + public function getNext(bool $onlyTimeSensitive = false): ?IJob { $query = $this->connection->getQueryBuilder(); $query->select('*') ->from('jobs') diff --git a/tests/lib/BackgroundJob/DummyJobList.php b/tests/lib/BackgroundJob/DummyJobList.php index ec06203a477..0751409f62c 100644 --- a/tests/lib/BackgroundJob/DummyJobList.php +++ b/tests/lib/BackgroundJob/DummyJobList.php @@ -78,7 +78,7 @@ class DummyJobList extends \OC\BackgroundJob\JobList { * @param bool $onlyTimeSensitive * @return IJob|null */ - public function getNext(bool $onlyTimeSensitive = true): ?IJob { + public function getNext(bool $onlyTimeSensitive = false): ?IJob { if (count($this->jobs) > 0) { if ($this->last < (count($this->jobs) - 1)) { $i = $this->last + 1; -- 2.39.5