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>
pull/32130/head
Kirill Popov 2 years ago committed by backportbot[bot]
parent 49cd75b1af
commit 651b7b2141

@ -146,6 +146,7 @@ try {
break; break;
} }
$logger->debug('CLI cron call has selected job with ID ' . strval($job->getId()), ['app' => 'cron']);
$job->execute($jobList, $logger); $job->execute($jobList, $logger);
// clean up after unclean jobs // clean up after unclean jobs
\OC_Util::tearDownFS(); \OC_Util::tearDownFS();
@ -168,6 +169,7 @@ try {
$jobList = \OC::$server->getJobList(); $jobList = \OC::$server->getJobList();
$job = $jobList->getNext(); $job = $jobList->getNext();
if ($job != null) { if ($job != null) {
$logger->debug('WebCron call has selected job with ID ' . strval($job->getId()), ['app' => 'cron']);
$job->execute($jobList, $logger); $job->execute($jobList, $logger);
$jobList->setLastJob($job); $jobList->setLastJob($job);
} }

@ -187,7 +187,7 @@ class JobList implements IJobList {
* @param bool $onlyTimeSensitive * @param bool $onlyTimeSensitive
* @return IJob|null * @return IJob|null
*/ */
public function getNext(bool $onlyTimeSensitive = true): ?IJob { public function getNext(bool $onlyTimeSensitive = false): ?IJob {
$query = $this->connection->getQueryBuilder(); $query = $this->connection->getQueryBuilder();
$query->select('*') $query->select('*')
->from('jobs') ->from('jobs')

@ -78,7 +78,7 @@ class DummyJobList extends \OC\BackgroundJob\JobList {
* @param bool $onlyTimeSensitive * @param bool $onlyTimeSensitive
* @return IJob|null * @return IJob|null
*/ */
public function getNext(bool $onlyTimeSensitive = true): ?IJob { public function getNext(bool $onlyTimeSensitive = false): ?IJob {
if (count($this->jobs) > 0) { if (count($this->jobs) > 0) {
if ($this->last < (count($this->jobs) - 1)) { if ($this->last < (count($this->jobs) - 1)) {
$i = $this->last + 1; $i = $this->last + 1;

Loading…
Cancel
Save