Bladeren bron

fix(bg-jobs): fix minor issues

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Marcel Klehr 5 maanden geleden
bovenliggende
commit
a3d8632fbe
2 gewijzigde bestanden met toevoegingen van 3 en 8 verwijderingen
  1. 2 7
      core/Command/Background/JobWorker.php
  2. 1 1
      lib/private/BackgroundJob/JobList.php

+ 2 - 7
core/Command/Background/JobWorker.php

@@ -36,11 +36,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 class JobWorker extends JobBase {
 	private array $executedJobs = [];
 
-	public function __construct(IJobList $jobList,
-								LoggerInterface $logger) {
-		parent::__construct($jobList, $logger);
-	}
-
 	protected function configure(): void {
 		parent::configure();
 
@@ -76,6 +71,8 @@ class JobWorker extends JobBase {
 			return 1;
 		}
 
+		$interval = (int)($input->getOption('interval') ?? 5);
+
 		while (true) {
 			// Handle canceling of the process
 			try {
@@ -89,8 +86,6 @@ class JobWorker extends JobBase {
 
 			$this->printSummary($input, $output);
 
-			$interval = (int)($input->getOption('interval') ?? 5);
-
 			// Unlock jobs that should be executed again after the interval
 			// Alternative could be to set last_checked to interval in the future to avoid the extra locks
 			foreach ($this->executedJobs as $id => $time) {

+ 1 - 1
lib/private/BackgroundJob/JobList.php

@@ -448,7 +448,7 @@ class JobList implements IJobList {
 		$result = $query->executeQuery();
 
 		$jobs = [];
-		while ($row = $result->fetch()) {
+		while (($row = $result->fetch()) !== false) {
 			$jobs[] = $row;
 		}