From 8775f97adc4f3dc8ce21f5d25c330d4081681bb6 Mon Sep 17 00:00:00 2001
From: GurvanVgx <87641828+GurvanVgx@users.noreply.github.com>
Date: Tue, 11 Oct 2022 12:38:51 +0200
Subject: [PATCH] [Messenger] Fix amqp socket lost

Co-authored-by: Miguel Fernandez <mfernandez@nuglif.com>
---
 Transport/Connection.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Transport/Connection.php b/Transport/Connection.php
index e5a9d59..35fa87c 100644
--- a/Transport/Connection.php
+++ b/Transport/Connection.php
@@ -102,6 +102,11 @@ class Connection
      */
     private $amqpDelayExchange;
 
+    /**
+     * @var int
+     */
+    private $lastActivityTime = 0;
+
     public function __construct(array $connectionOptions, array $exchangeOptions, array $queuesOptions, AmqpFactory $amqpFactory = null)
     {
         if (!\extension_loaded('amqp')) {
@@ -347,6 +352,8 @@ private function publishOnExchange(\AMQPExchange $exchange, string $body, string
         $attributes['delivery_mode'] = $attributes['delivery_mode'] ?? 2;
         $attributes['timestamp'] = $attributes['timestamp'] ?? time();
 
+        $this->lastActivityTime = time();
+
         $exchange->publish(
             $body,
             $routingKey,
@@ -510,6 +517,11 @@ static function (): bool {
                     }
                 );
             }
+
+            $this->lastActivityTime = time();
+        } elseif (0 < ($this->connectionOptions['heartbeat'] ?? 0) && time() > $this->lastActivityTime + 2 * $this->connectionOptions['heartbeat']) {
+            $disconnectMethod = 'true' === ($this->connectionOptions['persistent'] ?? 'false') ? 'pdisconnect' : 'disconnect';
+            $this->amqpChannel->getConnection()->{$disconnectMethod}();
         }
 
         return $this->amqpChannel;