Skip to content
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

[5.3] Catch errors when handling a failed job #16212

Merged
merged 14 commits into from
Nov 2, 2016
Merged

[5.3] Catch errors when handling a failed job #16212

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9dd1d9f
Catch errors when handling a failed job
Nov 1, 2016
914ba34
Forgot a space
Nov 1, 2016
c1de491
Try catch failJob
Nov 1, 2016
bc95299
Merge remote-tracking branch 'origin/fix-queue-failed-job-event' into…
Nov 1, 2016
2d51e3f
Merge remote-tracking branch 'laravel/5.3' into fix-queue-failed-job-…
Nov 1, 2016
5d8d7ba
Remove merge comments
Nov 1, 2016
1cfcbe2
Forgot a space
Nov 1, 2016
f86278b
Catch exception
Nov 1, 2016
bc931b0
Style changes
Nov 1, 2016
b5e4f28
Catch exception
Nov 1, 2016
cc03e83
Remove line
Nov 1, 2016
1191786
Fix tests
Nov 2, 2016
ea81fcf
Merge remote-tracking branch 'laravel/5.3' into fix-queue-failed-job-…
Nov 2, 2016
f052310
Replaced empty catch with finally
Nov 2, 2016
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
16 changes: 9 additions & 7 deletions src/Illuminate/Queue/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,14 +301,16 @@ protected function failJob($connectionName, $job, $e)
return;
}

// If the job has failed, we will delete it, call the "failed" method and then call
// an event indicating the job has failed so it can be logged if needed. This is
// to allow every developer to better keep monitor of their failed queue jobs.
$job->delete();

$job->failed($e);
try {
// If the job has failed, we will delete it, call the "failed" method and then call
// an event indicating the job has failed so it can be logged if needed. This is
// to allow every developer to better keep monitor of their failed queue jobs.
$job->delete();

$this->raiseFailedJobEvent($connectionName, $job, $e);
$job->failed($e);
} finally {
$this->raiseFailedJobEvent($connectionName, $job, $e);
}
}

/**
Expand Down