Skip to content

fix(federation): reset retainJob at start of run() #60714

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

Open
solracsf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(federation): reset retainJob at start of run() #60714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions apps/federation/lib/BackgroundJob/GetSharedSecret.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ protected function parentStart(IJobList $jobList): void {

#[\Override]
protected function run($argument) {
// The DI container caches this instance, so a prior invocation in the
// same cron pass can leave $retainJob = true and cause this row to be
// re-queued unconditionally after start() removes it.
$this->retainJob = false;
$target = $argument['url'];
$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
$currentTime = $this->time->getTime();
Expand Down
4 changes: 4 additions & 0 deletions apps/federation/lib/BackgroundJob/RequestSharedSecret.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ protected function parentStart(IJobList $jobList): void {
*/
#[\Override]
protected function run($argument) {
// The DI container caches this instance, so a prior invocation in the
// same cron pass can leave $retainJob = true and cause this row to be
// re-queued unconditionally after start() removes it.
$this->retainJob = false;
$target = $argument['url'];
$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
$currentTime = $this->time->getTime();
Expand Down
Loading