diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
index a08c102a4b9da..e57dad6cad97e 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
@@ -774,6 +774,73 @@ public function testItCanBeConstructedWithTLSOptionsAndNonTLSDsn()
);
}
+ public function testItCanRetryPublishWhenAMQPConnectionExceptionIsThrown()
+ {
+ $factory = new TestAmqpFactory(
+ $amqpConnection = $this->createMock(\AMQPConnection::class),
+ $amqpChannel = $this->createMock(\AMQPChannel::class),
+ $amqpQueue = $this->createMock(\AMQPQueue::class),
+ $amqpExchange = $this->createMock(\AMQPExchange::class)
+ );
+
+ $amqpExchange->expects($this->exactly(2))
+ ->method('publish')
+ ->willReturnOnConsecutiveCalls(
+ $this->throwException(new \AMQPConnectionException('a socket error occurred')),
+ null
+ );
+
+ $connection = Connection::fromDsn('amqp://localhost', [], $factory);
+ $connection->publish('body');
+ }
+
+ public function testItCanRetryPublishWithDelayWhenAMQPConnectionExceptionIsThrown()
+ {
+ $factory = new TestAmqpFactory(
+ $amqpConnection = $this->createMock(\AMQPConnection::class),
+ $amqpChannel = $this->createMock(\AMQPChannel::class),
+ $amqpQueue = $this->createMock(\AMQPQueue::class),
+ $amqpExchange = $this->createMock(\AMQPExchange::class)
+ );
+
+ $amqpExchange->expects($this->exactly(2))
+ ->method('publish')
+ ->willReturnOnConsecutiveCalls(
+ $this->throwException(new \AMQPConnectionException('a socket error occurred')),
+ null
+ );
+
+ $connection = Connection::fromDsn('amqp://localhost', [], $factory);
+ $connection->publish('body', [], 5000);
+ }
+
+ public function testItWillRetryMaxThreeTimesWhenAMQPConnectionExceptionIsThrown()
+ {
+ $factory = new TestAmqpFactory(
+ $amqpConnection = $this->createMock(\AMQPConnection::class),
+ $amqpChannel = $this->createMock(\AMQPChannel::class),
+ $amqpQueue = $this->createMock(\AMQPQueue::class),
+ $amqpExchange = $this->createMock(\AMQPExchange::class)
+ );
+
+ $exception = new \AMQPConnectionException('a socket error occurred');
+
+ $amqpExchange->expects($this->exactly(4))
+ ->method('publish')
+ ->willReturnOnConsecutiveCalls(
+ $this->throwException($exception),
+ $this->throwException($exception),
+ $this->throwException($exception),
+ $this->throwException($exception),
+ );
+
+ self::expectException($exception::class);
+ self::expectExceptionMessage($exception->getMessage());
+
+ $connection = Connection::fromDsn('amqp://localhost', [], $factory);
+ $connection->publish('body');
+ }
+
private function createDelayOrRetryConnection(\AMQPExchange $delayExchange, string $deadLetterExchangeName, string $delayQueueName): Connection
{
$amqpConnection = $this->createMock(\AMQPConnection::class);
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
index b39902623adce..0ae1bff21d7c8 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -287,19 +287,21 @@ public function publish(string $body, array $headers = [], int $delayInMs = 0, ?
$this->setupExchangeAndQueues(); // also setup normal exchange for delayed messages so delay queue can DLX messages to it
}
- 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;
+ }
- $this->publishOnExchange(
- $this->exchange(),
- $body,
- $this->getRoutingKeyForMessage($amqpStamp),
- $headers,
- $amqpStamp
- );
+ $this->publishOnExchange(
+ $this->exchange(),
+ $body,
+ $this->getRoutingKeyForMessage($amqpStamp),
+ $headers,
+ $amqpStamp
+ );
+ });
}
/**
@@ -545,11 +547,16 @@ public function exchange(): \AMQPExchange
private function clearWhenDisconnected(): void
{
if (!$this->channel()->isConnected()) {
- unset($this->amqpChannel, $this->amqpExchange, $this->amqpDelayExchange);
- $this->amqpQueues = [];
+ $this->clear();
}
}
+ private function clear(): void
+ {
+ unset($this->amqpChannel, $this->amqpExchange, $this->amqpDelayExchange);
+ $this->amqpQueues = [];
+ }
+
private function getDefaultPublishRoutingKey(): ?string
{
return $this->exchangeOptions['default_publish_routing_key'] ?? null;
@@ -566,4 +573,23 @@ private function getRoutingKeyForMessage(?AmqpStamp $amqpStamp): ?string
{
return $amqpStamp?->getRoutingKey() ?? $this->getDefaultPublishRoutingKey();
}
+
+ 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;
+ }
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy