diff options
| author | Kirill Popov <kirill.s.popov@gmail.com> | 2022-04-23 16:42:37 +0300 |
|---|---|---|
| committer | Kirill Popov <kirill.s.popov@gmail.com> | 2022-04-24 21:55:53 +0300 |
| commit | 0b27b9e658509861cfa5e937cefd8c87a54217bb (patch) | |
| tree | 0a78c47a6aac502314c390bf167f8653444fd04d | |
| parent | 20d7bf8a880ddf41874afdaf3784d29bc1bc925d (diff) | |
| download | nextcloud-server-0b27b9e658509861cfa5e937cefd8c87a54217bb.tar.gz nextcloud-server-0b27b9e658509861cfa5e937cefd8c87a54217bb.zip | |
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 <kirill.s.popov@gmail.com>
| -rw-r--r-- | cron.php | 2 | ||||
| -rw-r--r-- | lib/private/BackgroundJob/JobList.php | 2 | ||||
| -rw-r--r-- | tests/lib/BackgroundJob/DummyJobList.php | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -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; |