diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/CHANGELOG.md b/src/Symfony/Component/Messenger/Bridge/Amqp/CHANGELOG.md
index ff8061b69190e..3d0b4773e758d 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========
+7.4
+---
+
+ * Add option `delay[daily_delay_queues]` in the transport definition
+
7.1
---
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 f61c14cab0663..0ca79ecedb1a6 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
@@ -507,6 +507,22 @@ public function testItDelaysTheMessage()
$connection->publish('{}', ['x-some-headers' => 'foo'], 5000);
}
+ public function testItDelaysTheMessageWithDailyDelayQueues()
+ {
+ $delayExchange = $this->createMock(\AMQPExchange::class);
+ $date = (new \DateTimeImmutable())->format('Y-m-d');
+ $delayExchange->expects($this->once())
+ ->method('publish')
+ ->with('{}', "delay_messages__5000_delay_$date", \AMQP_NOPARAM, [
+ 'headers' => ['x-some-headers' => 'foo'],
+ 'delivery_mode' => 2,
+ 'timestamp' => time(),
+ ]);
+ $connection = $this->createDelayOrRetryConnection($delayExchange, self::DEFAULT_EXCHANGE_NAME, "delay_messages__5000_delay_$date", true);
+
+ $connection->publish('{}', ['x-some-headers' => 'foo'], 5000);
+ }
+
public function testItRetriesTheMessage()
{
$delayExchange = $this->createMock(\AMQPExchange::class);
@@ -520,6 +536,19 @@ public function testItRetriesTheMessage()
$connection->publish('{}', [], 5000, $amqpStamp);
}
+ public function testItRetriesTheMessageWithDailyDelayQueues()
+ {
+ $delayExchange = $this->createMock(\AMQPExchange::class);
+ $date = (new \DateTimeImmutable())->format('Y-m-d');
+ $delayExchange->expects($this->once())
+ ->method('publish')
+ ->with('{}', "delay_messages__5000_retry_$date", \AMQP_NOPARAM);
+ $connection = $this->createDelayOrRetryConnection($delayExchange, '', "delay_messages__5000_retry_$date", true);
+
+ $amqpStamp = AmqpStamp::createFromAmqpEnvelope($this->createMock(\AMQPEnvelope::class), null, '');
+ $connection->publish('{}', [], 5000, $amqpStamp);
+ }
+
public function testItDelaysTheMessageWithADifferentRoutingKeyAndTTLs()
{
$amqpConnection = $this->createMock(\AMQPConnection::class);
@@ -849,7 +878,7 @@ public function testItWillRetryMaxThreeTimesWhenAMQPConnectionExceptionIsThrown(
$connection->publish('body');
}
- private function createDelayOrRetryConnection(\AMQPExchange $delayExchange, string $deadLetterExchangeName, string $delayQueueName): Connection
+ private function createDelayOrRetryConnection(\AMQPExchange $delayExchange, string $deadLetterExchangeName, string $delayQueueName, bool $dailyDelayQueues = false): Connection
{
$amqpConnection = $this->createMock(\AMQPConnection::class);
$amqpChannel = $this->createMock(\AMQPChannel::class);
@@ -861,19 +890,20 @@ private function createDelayOrRetryConnection(\AMQPExchange $delayExchange, stri
$delayQueue = $this->createMock(\AMQPQueue::class);
$factory->method('createQueue')->willReturn($this->createMock(\AMQPQueue::class), $delayQueue);
$factory->method('createExchange')->willReturn($this->createMock(\AMQPExchange::class), $delayExchange);
-
+ $baseExpire = $dailyDelayQueues ? 86400 * 1000 : 0;
$delayQueue->expects($this->once())->method('setName')->with($delayQueueName);
$delayQueue->expects($this->once())->method('setArguments')->with([
'x-message-ttl' => 5000,
- 'x-expires' => 5000 + 10000,
+ 'x-expires' => 5000 + 10000 + $baseExpire,
'x-dead-letter-exchange' => $deadLetterExchangeName,
'x-dead-letter-routing-key' => '',
]);
$delayQueue->expects($this->once())->method('declareQueue');
$delayQueue->expects($this->once())->method('bind')->with('delays', $delayQueueName);
+ $options = $dailyDelayQueues ? ['delay' => ['daily_delay_queues' => true]] : [];
- return Connection::fromDsn('amqp://localhost', [], $factory);
+ return Connection::fromDsn('amqp://localhost', $options, $factory);
}
}
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
index 0a6197810d4a2..eef97cc522300 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -144,6 +144,11 @@ public function __construct(
* * queue_name_pattern: Pattern to use to create the queues (Default: "delay_%exchange_name%_%routing_key%_%delay%")
* * exchange_name: Name of the exchange to be used for the delayed/retried messages (Default: "delays")
* * arguments: array of extra delay queue arguments (for example: ['x-queue-type' => 'classic', 'x-message-deduplication' => true,])
+ * * daily_delay_queues: When true, delay queues will be created with names including the current date
+ * (e.g., '%queue_name_pattern%_%current_date%'). These queues are automatically deleted by RabbitMQ after they
+ * expire (x-expires argument), the x-expires argument is set to 24 hours (24 * 60 * 60 * 1000) plus delay. This is useful for quorum queues.
+ * because quorum queues do not redeclare expire time.
+ * (Default: false)
* * auto_setup: Enable or not the auto-setup of queues and exchanges (Default: true)
*
* * Connection tuning options (see http://www.rabbitmq.com/amqp-0-9-1-reference.html#connection.tune for details):
@@ -390,11 +395,14 @@ private function createDelayQueue(int $delay, ?string $routingKey, bool $isRetry
$queue = $this->amqpFactory->createQueue($this->channel());
$queue->setName($this->getRoutingKeyForDelay($delay, $routingKey, $isRetryAttempt));
$queue->setFlags(\AMQP_DURABLE);
+ $queueExpirationBase = ($this->connectionOptions['delay']['daily_delay_queues'] ?? false) ? 24 * 60 * 60 * 1000 : 0;
$queue->setArguments(array_merge([
'x-message-ttl' => $delay,
// delete the delay queue 10 seconds after the message expires
// publishing another message redeclares the queue which renews the lease
- 'x-expires' => $delay + 10000,
+ // For quorum queues, redeclaration is not allowed, so using daily_delay_queues=true is recommended to manage cleanup.
+ // It will create a new queue for each day, with x-expires set to 24 hours (24 * 60 * 60 * 1000) plus delay.
+ 'x-expires' => $queueExpirationBase + $delay + 10000,
// message should be broadcast to all consumers during delay, but to only one queue during retry
// empty name is default direct exchange
'x-dead-letter-exchange' => $isRetryAttempt ? '' : $this->exchangeOptions['name'],
@@ -409,12 +417,13 @@ private function createDelayQueue(int $delay, ?string $routingKey, bool $isRetry
private function getRoutingKeyForDelay(int $delay, ?string $finalRoutingKey, bool $isRetryAttempt): string
{
$action = $isRetryAttempt ? '_retry' : '_delay';
+ $date = ($this->connectionOptions['delay']['daily_delay_queues'] ?? false) ? '_'.(new \DateTimeImmutable())->format('Y-m-d') : '';
return str_replace(
['%delay%', '%exchange_name%', '%routing_key%'],
[$delay, $this->exchangeOptions['name'], $finalRoutingKey ?? ''],
$this->connectionOptions['delay']['queue_name_pattern']
- ).$action;
+ ).$action.$date;
}
/**
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