upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(bg-jobs): fix psalm issues

Browse source 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
Marcel Klehr 2023-12-20 14:29:44 +01:00 committed by Julien Veyssier
parent 993398b88a
commit 352d79deee
No known key found for this signature in database
GPG key ID: 4141FEE162030638
5 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/Command/Background/JobBase.php
View file

@ -45,6 +45,10 @@ abstract class JobBase extends \OC\Core\Command\Base {
protected function printJobInfo(int $jobId, IJob $job, OutputInterface $output): void {
$row = $this->jobList->getDetailsById($jobId);
if ($row === null) {
return;
}
$lastRun = new \DateTime();
$lastRun->setTimestamp((int) $row['last_run']);
$lastChecked = new \DateTime();
@ -55,10 +59,10 @@ abstract class JobBase extends \OC\Core\Command\Base {
$output->writeln('Job class: ' . get_class($job));
$output->writeln('Arguments: ' . json_encode($job->getArgument()));
$isTimedJob = $job instanceof \OC\BackgroundJob\TimedJob || $job instanceof \OCP\BackgroundJob\TimedJob;
$isTimedJob = $job instanceof \OCP\BackgroundJob\TimedJob;
if ($isTimedJob) {
$output->writeln('Type: timed');
} elseif ($job instanceof \OC\BackgroundJob\QueuedJob || $job instanceof \OCP\BackgroundJob\QueuedJob) {
} elseif ($job instanceof \OCP\BackgroundJob\QueuedJob) {
$output->writeln('Type: queued');
} else {
$output->writeln('Type: job');
@ -81,7 +85,7 @@ abstract class JobBase extends \OC\Core\Command\Base {
$interval = $intervalProperty->getValue($job);
$nextRun = new \DateTime();
$nextRun->setTimestamp($row['last_run'] + $interval);
$nextRun->setTimestamp((int)$row['last_run'] + $interval);
if ($nextRun > new \DateTime()) {
$output->writeln('Next execution: <comment>' . $nextRun->format(\DateTimeInterface::ATOM) . '</comment>');

5
core/Command/Background/JobWorker.php
View file

@ -27,6 +27,7 @@ namespace OC\Core\Command\Background;
use OC\Core\Command\InterruptedException;
use OCP\BackgroundJob\IJobList;
use OCP\ITempManager;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
@ -101,11 +102,11 @@ class JobWorker extends JobBase {
$this->printJobInfo($job->getId(), $job, $output);
}
$job->execute($this->jobList, \OC::$server->getLogger());
$job->start($this->jobList);
// clean up after unclean jobs
\OC_Util::tearDownFS();
\OC::$server->getTempManager()->clean();
\OC::$server->get(ITempManager::class)->clean();
$this->jobList->setLastJob($job);
$this->jobList->unlockJob($job);

5
core/register_command.php
View file

@ -55,11 +55,6 @@ use OCP\IConfig;
use OCP\Server;
use Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand;
use OC\Core\Command;
use OCP\IConfig;
use OCP\Server;
use Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand;
$application->add(new CompletionCommand());
$application->add(Server::get(Command\Status::class));
$application->add(Server::get(Command\Check::class));

5
lib/private/BackgroundJob/JobList.php
View file

@ -448,11 +448,14 @@ class JobList implements IJobList {
$result = $query->executeQuery();
$jobs = [];
while (($row = $result->fetch()) !== false) {
/**
* @var array{count:int, class:class-string} $row
*/
$jobs[] = $row;
}
return $jobs;
}
}

12
lib/public/BackgroundJob/IJobList.php
View file

@ -110,9 +110,9 @@ interface IJobList {
/**
* get the next job in the list
*
* @since 7.0.0 - In 24.0.0 parameter $onlyTimeSensitive got added
* @since 7.0.0 - In 24.0.0 parameter $onlyTimeSensitive got added; In 29.0.0 parameter $jobClass got added
*/
public function getNext(bool $onlyTimeSensitive = false): ?IJob;
public function getNext(bool $onlyTimeSensitive = false, string $jobClass = null): ?IJob;
/**
* @since 7.0.0
@ -168,4 +168,12 @@ interface IJobList {
* @since 27.0.0
*/
public function hasReservedJob(?string $className): bool;
/**
* Returns a count of jobs per Job class
*
* @return list<array{class:class-string, count:int}>
* @since 29.0.0
*/
public function countByClass(): array;
}