[Messenger] backport #54167: retry AMQPConnectionException on publish

gustaf-ag47 · gustaf-ag47 · commit 18912b6aeb92 · 2026-04-09T11:40:29.000+02:00
Ports the upstream Symfony 5.4/6.4 fix for symfony/symfony#48241 into this 4.4 fork. Wraps Connection::publish() in withConnectionExceptionRetry() which catches \AMQPConnectionException, drops cached channel/queues/exchanges via clear(), and retries up to 3 times with no backoff. Fixes intermittent AMQPS publish failures against AWS AmazonMQ caused by AWS NLB's 350s idle TCP timeout silently killing connections — ext-amqp's isConnected() doesn't detect the dead socket so the next publish surfaces as "Library error: a SSL error occurred". Upstream PR: symfony/symfony#54167 Upstream issue: symfony/symfony#48241
diff --git a/Transport/AmqpExt/Connection.php b/Transport/AmqpExt/Connection.php
@@ -187,23 +187,25 @@ public function publish(string $body, array $headers = [], int $delayInMs = 0, A
     {
         $this->clearWhenDisconnected();
 
-        if (0 !== $delayInMs) {
-            $this->publishWithDelay($body, $headers, $delayInMs, $amqpStamp);
+        $this->withConnectionExceptionRetry(function () use ($body, $headers, $delayInMs, $amqpStamp) {
+            if (0 !== $delayInMs) {
+                $this->publishWithDelay($body, $headers, $delayInMs, $amqpStamp);
 
-            return;
-        }
+                return;
+            }
 
-        if ($this->shouldSetup()) {
-            $this->setupExchangeAndQueues();
-        }
+            if ($this->shouldSetup()) {
+                $this->setupExchangeAndQueues();
+            }
 
-        $this->publishOnExchange(
-            $this->exchange(),
-            $body,
-            $this->getRoutingKeyForMessage($amqpStamp),
-            $headers,
-            $amqpStamp
-        );
+            $this->publishOnExchange(
+                $this->exchange(),
+                $body,
+                $this->getRoutingKeyForMessage($amqpStamp),
+                $headers,
+                $amqpStamp
+            );
+        });
     }
 
     /**
@@ -442,10 +444,34 @@ public function exchange(): \AMQPExchange
     private function clearWhenDisconnected(): void
     {
         if (!$this->channel()->isConnected()) {
-            $this->amqpChannel = null;
-            $this->amqpQueues = [];
-            $this->amqpExchange = null;
-            $this->amqpDelayExchange = null;
+            $this->clear();
+        }
+    }
+
+    private function clear(): void
+    {
+        $this->amqpChannel = null;
+        $this->amqpQueues = [];
+        $this->amqpExchange = null;
+        $this->amqpDelayExchange = null;
+    }
+
+    private function withConnectionExceptionRetry(callable $callable): void
+    {
+        $maxRetries = 3;
+        $retries = 0;
+
+        retry:
+        try {
+            $callable();
+        } catch (\AMQPConnectionException $e) {
+            if (++$retries <= $maxRetries) {
+                $this->clear();
+
+                goto retry;
+            }
+
+            throw $e;
         }
     }
 
