upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix: delete background jobs by id when cleaning up

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2024-05-30 15:07:26 +02:00 committed by backportbot[bot]
parent 78fd195e6a
commit 40442f5337
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,7 @@ class JobList implements IJobList {
}
}
protected function removeById(int $id): void {
public function removeById(int $id): void {
$query = $this->connection->getQueryBuilder();
$query->delete('jobs')
->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));

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

@ -79,6 +79,14 @@ interface IJobList {
*/
public function remove($job, $argument = null): void;
/**
* Remove a job from the list by id
*
* @param int $id
* @since 30.0.0
*/
public function removeById(int $id): void;
/**
* check if a job is in the list
*

6
lib/public/BackgroundJob/QueuedJob.php
View file

@ -53,7 +53,11 @@ abstract class QueuedJob extends Job {
* @since 25.0.0
*/
final public function start(IJobList $jobList): void {
$jobList->remove($this, $this->argument);
if ($this->id) {
$jobList->removeById($this->id);
} else {
$jobList->remove($this, $this->argument);
}
parent::start($jobList);
}
}