BUGFIX: Return null on timeout

Resolves #18
t3n · Mar 14, 2022 · 9f30211 · 9f30211
1 parent aa51589
commit 9f30211
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Classes/Queue/RabbitQueue.php b/Classes/Queue/RabbitQueue.php
@@ -10,6 +10,7 @@
 use Neos\Utility\ObjectAccess;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
+use PhpAmqpLib\Exception\AMQPTimeoutException;
 use PhpAmqpLib\Message\AMQPMessage;
 use PhpAmqpLib\Wire\AMQPTable;
 
@@ -325,7 +326,11 @@ protected function dequeue(bool $ack = true, ?int $timeout = null): ?Message
         });
 
         while ($cache === null) {
-            $this->channel->wait(null, false, $timeout ?: 0);
+            try {
+                $this->channel->wait(null, false, $timeout ?: 0);
+            } catch (AMQPTimeoutException $e) {
+                return null;
+            }
         }
 
         $this->channel->basic_cancel($consumerTag);