upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Adjust namespace and print a message when the job was skipped

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-06-08 10:06:24 +02:00
parent 9cd9f4b4bc
commit 0a812a1c09
No known key found for this signature in database
GPG key ID: 7076EA9751AACDDA
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/Command/Background/Job.php
View file

@ -49,7 +49,7 @@ class Job extends Command {
protected function configure(): void {
$this
->setName('background:job')
->setName('background-job:execute')
->setDescription('Execute a single background job manually')
->addArgument(
'job-id',
@ -75,22 +75,31 @@ class Job extends Command {
}
$this->printJobInfo($jobId, $job, $output);
$output->writeln('');
$lastRun = $job->getLastRun();
if ($input->getOption('force-execute')) {
$output->writeln('');
$lastRun = 0;
$output->writeln('<comment>Forcing execution of the job</comment>');
$output->writeln('');
$this->jobList->resetBackgroundJob($job);
$job = $this->jobList->getById($jobId);
$job->execute($this->jobList, $this->logger);
$this->jobList->setLastJob($job);
}
$job = $this->jobList->getById($jobId);
$job->execute($this->jobList, $this->logger);
$job = $this->jobList->getById($jobId);
if ($lastRun !== $job->getLastRun()) {
$output->writeln('<info>Job executed!</info>');
$output->writeln('');
if ($job instanceof \OC\BackgroundJob\TimedJob || $job instanceof \OCP\BackgroundJob\TimedJob) {
$this->printJobInfo($jobId, $job, $output);
}
} else {
$output->writeln('<comment>Job was not executed because it is not due</comment>');
$output->writeln('Specify the <question>--force-execute</question> option to run it anyway');
}
return 0;