Merge pull request #27 from juriansluiman/catch-aws-exception

Rethrow SQS exception

Author: bakura10

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.2
+
+- SlmQueueSqs now rethrow SQS exceptions instead of silently reinserting the job without notice.
+
 # 0.4.1
 
 - Fix a bug when batch pushing/batch deleting a multiple of 10 jobs into the queue.

src/SlmQueueSqs/Worker/SqsWorker.php

@@ -2,6 +2,7 @@
 
 namespace SlmQueueSqs\Worker;
 
+use Aws\Sqs\Exception\SqsException;
 use Exception;
 use SlmQueue\Job\JobInterface;
 use SlmQueue\Queue\QueueInterface;
@@ -31,6 +32,10 @@ public function processJob(JobInterface $job, QueueInterface $queue)
             $queue->delete($job);
 
             return WorkerEvent::JOB_STATUS_SUCCESS;
+        } catch (SqsException $sqsException) {
+            // We want to retrigger SQS exception as they may include useful debugging information like lack of
+            // permissions
+            throw $sqsException;
         } catch (Exception $exception) {
             // Do nothing, the job will be reinserted automatically for another try
             return WorkerEvent::JOB_STATUS_FAILURE_RECOVERABLE;

tests/SlmQueueSqsTest/Worker/SqsWorkerTest.php

@@ -2,6 +2,7 @@
 
 namespace SlmQueueSqsTest\Worker;
 
+use Aws\Sqs\Exception\SqsException;
 use PHPUnit_Framework_TestCase as TestCase;
 use SlmQueue\Worker\WorkerEvent;
 use SlmQueueSqs\Worker\SqsWorker;
@@ -55,4 +56,19 @@ public function testDoNotDeleteJobOnFailure()
         $this->assertEquals(WorkerEvent::JOB_STATUS_FAILURE_RECOVERABLE, $status);
     }
 
+    public function testRethrowSqsException()
+    {
+        $this->setExpectedException('Aws\Sqs\Exception\SqsException');
+
+        $queue = $this->getMock('SlmQueueSqs\Queue\SqsQueueInterface');
+        $job   = $this->getMock('SlmQueue\Job\JobInterface');
+
+        $job->expects($this->once())
+            ->method('execute')
+            ->will($this->throwException(new SqsException()));
+
+        $queue->expects($this->never())->method('delete');
+
+        $this->worker->processJob($job, $queue);
+    }
 }