Merge pull request #18 from CMProductions/fix_aws_reader

fix purging queue and allow graceful stops
Mad-Collective · Oct 20, 2017 · f016e70 · f016e70
2 parents c0e7a7b + 50545b4
commit f016e70
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Cmp/Queues/Infrastructure/AWS/v20121105/Queue/QueueReader.php b/src/Cmp/Queues/Infrastructure/AWS/v20121105/Queue/QueueReader.php
@@ -3,6 +3,7 @@
 namespace Cmp\Queues\Infrastructure\AWS\v20121105\Queue;
 
 use Aws\Sqs\SqsClient;
+use Cmp\Queues\Domain\Queue\Exception\GracefulStopException;
 use Cmp\Queues\Domain\Queue\Exception\ReaderException;
 use Cmp\Queues\Domain\Queue\Exception\TimeoutReaderException;
 use Cmp\Queues\Domain\Queue\QueueReader as DomainQueueReader;
@@ -69,6 +70,8 @@ public function read(callable $callback, $timeout=0)
 
         try {
             $this->consume($timeout);
+        } catch(GracefulStopException $e) {
+            $this->logger->info("Gracefully stopping the AWS queue reader", ["exception" => $e]);
         } catch(TimeoutReaderException $e) {
             throw $e;
         } catch(\Exception $e) {
@@ -81,7 +84,9 @@ public function read(callable $callback, $timeout=0)
      */
     public function purge()
     {
-        $this->sqs->purgeQueue($this->queueUrl);
+        $this->sqs->purgeQueue([
+            'QueueUrl' => $this->queueUrl,
+        ]);
     }
 
     /**