Merge pull request #32131 from nextcloud/backport/32109/stable23

[stable23] Get not only time-sensitive next job from list but any when not in cron-mode

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 67caea62af0..b4041025ad8 100644
--- a/lib/private/BackgroundJob/JobList.php
+++ b/lib/private/BackgroundJob/JobList.php
@@ -187,7 +187,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;