From 831c9b6d7e015d5052bb7d379189a4f8003977a6 Mon Sep 17 00:00:00 2001
From: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
Date: Fri, 9 Aug 2024 15:35:52 +0200
Subject: [PATCH] Timeout waiting for new messages after 60s

---
 src/SnmpDiscoveryCollector.class.inc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/SnmpDiscoveryCollector.class.inc.php b/src/SnmpDiscoveryCollector.class.inc.php
index 9836113..efcfbb8 100644
--- a/src/SnmpDiscoveryCollector.class.inc.php
+++ b/src/SnmpDiscoveryCollector.class.inc.php
@@ -1,6 +1,7 @@
 <?php
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
+use PhpAmqpLib\Exception\AMQPTimeoutException;
 use PhpAmqpLib\Message\AMQPMessage;
 
 class SnmpDiscoveryCollector extends Collector
@@ -74,7 +75,12 @@ protected function Fetch(): array|false
 		while ($this->bDistributed && !empty($this->aIPAddresses))
 		{
 			// Wait until new message arrives
-			$this->oChannel->consume();
+			try {
+				$this->oChannel->wait(timeout: 60);
+			} catch (AMQPTimeoutException $e) {
+				$this->oChannel->queue_purge($this->sQueue);
+				throw $e;
+			}
 			$sBody = $this->oResponseMessage->getBody();
 			$iKey = $this->oResponseMessage->get('correlation_id');