Skip to content

Commit f973645

Browse files
authored
Merge pull request #24 from dangreaves/exception-bubbling
Reinstate exception bubbling
2 parents 43fa288 + 149842e commit f973645

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

src/Controllers/WorkerController.php

+6-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Dusterio\AwsWorker\Controllers;
44

5-
use Dusterio\AwsWorker\Exceptions\FailedJobException;
65
use Dusterio\AwsWorker\Exceptions\MalformedRequestException;
76
use Dusterio\AwsWorker\Jobs\AwsJob;
87
use Dusterio\AwsWorker\Wrappers\WorkerInterface;
@@ -13,8 +12,6 @@
1312
use Illuminate\Contracts\Console\Kernel;
1413
use Illuminate\Console\Scheduling\Schedule;
1514
use Illuminate\Http\Response;
16-
use Symfony\Component\Debug\Exception\FatalThrowableError;
17-
use Throwable;
1815

1916
class WorkerController extends LaravelController
2017
{
@@ -65,7 +62,6 @@ public function schedule(Container $laravel, Kernel $kernel, Schedule $schedule)
6562
* @param Container $laravel
6663
* @param ExceptionHandler $exceptions
6764
* @return Response
68-
* @throws FailedJobException
6965
*/
7066
public function queue(Request $request, WorkerInterface $worker, Container $laravel, ExceptionHandler $exceptions)
7167
{
@@ -81,18 +77,12 @@ public function queue(Request $request, WorkerInterface $worker, Container $lara
8177
]
8278
]);
8379

84-
try {
85-
$worker->process(
86-
$request->header('X-Aws-Sqsd-Queue'), $job, [
87-
'maxTries' => 0,
88-
'delay' => 0
89-
]
90-
);
91-
} catch (\Exception $e) {
92-
$exceptions->report($e);
93-
} catch (Throwable $e) {
94-
$exceptions->report(new FatalThrowableError($e));
95-
}
80+
$worker->process(
81+
$request->header('X-Aws-Sqsd-Queue'), $job, [
82+
'maxTries' => 0,
83+
'delay' => 0
84+
]
85+
);
9686

9787
return $this->response([
9888
'Processed ' . $job->getJobId()

src/Exceptions/FailedJobException.php

-12
This file was deleted.

0 commit comments

Comments
 (0)