Skip to content

[stable21] Reset job disabling timer on adding the job again #30633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2022
Merged

[stable21] Reset job disabling timer on adding the job again #30633

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04e8861
Reset job disabling timer on adding the job again
juliusknorr Dec 21, 2021
67ccb32
Update lib/private/BackgroundJob/JobList.php
artonge Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions lib/private/BackgroundJob/JobList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,34 @@ public function __construct(IDBConnection $connection, IConfig $config, ITimeFac
* @param mixed $argument
*/
public function add($job, $argument = null) {
if (!$this->has($job, $argument)) {
if ($job instanceof IJob) {
$class = get_class($job);
} else {
$class = $job;
}
if ($job instanceof IJob) {
$class = get_class($job);
} else {
$class = $job;
}

$argument = json_encode($argument);
if (strlen($argument) > 4000) {
throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
}
$argumentJson = json_encode($argument);
if (strlen($argumentJson) > 4000) {
throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
}

$query = $this->connection->getQueryBuilder();
$query = $this->connection->getQueryBuilder();
if (!$this->has($job, $argument)) {
$query->insert('jobs')
->values([
'class' => $query->createNamedParameter($class),
'argument' => $query->createNamedParameter($argument),
'argument' => $query->createNamedParameter($argumentJson),
'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
]);
$query->execute();
} else {
$query->update('jobs')
->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
->set('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('class', $query->createNamedParameter($class)))
->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argumentJson)));
}
$query->execute();
}

/**
Expand Down