Skip to content

Fixes bug with ShouldBeUniqueUntilProcessing locks getting stuck due to Middleware #56318

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 4 commits into from
Jul 18, 2025
Merged

Fixes bug with ShouldBeUniqueUntilProcessing locks getting stuck due to Middleware #56318

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa6938c
Fixes bug with ShouldBeUniqueUntilProcessing locks
TWithers Jul 16, 2025
8f79150
Restore back callables
TWithers Jul 16, 2025
da6e6cf
Do not unlock if job was released
TWithers Jul 16, 2025
411b545
Update CallQueuedHandler.php
taylorotwell Jul 18, 2025
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
11 changes: 10 additions & 1 deletion src/Illuminate/Queue/CallQueuedHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,20 @@ protected function dispatchThroughMiddleware(Job $job, $command)
throw new Exception('Job is incomplete class: '.json_encode($command));
}

$lockReleased = false;

return (new Pipeline($this->container))->send($command)
->through(array_merge(method_exists($command, 'middleware') ? $command->middleware() : [], $command->middleware ?? []))
->then(function ($command) use ($job) {
->finally(function ($command) use (&$lockReleased) {
if (! $lockReleased && $command instanceof ShouldBeUniqueUntilProcessing && ! $command->job->isReleased()) {
$this->ensureUniqueJobLockIsReleased($command);
}
})
->then(function ($command) use ($job, &$lockReleased) {
if ($command instanceof ShouldBeUniqueUntilProcessing) {
$this->ensureUniqueJobLockIsReleased($command);

$lockReleased = true;
}

return $this->dispatcher->dispatchNow(
Expand Down