Skip to content

Commit 8c0385a

Browse files
committed
delay strategy
1 parent 4f65c87 commit 8c0385a

1 file changed

Lines changed: 17 additions & 12 deletions

File tree

‎pkg/amqp-tools/RabbitMQDlxDelayStrategy.php‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,27 @@ class RabbitMQDlxDelayStrategy implements DelayStrategy
1616
*/
1717
public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, $delayMsec)
1818
{
19+
$properties = $message->getProperties();
20+
21+
// The x-death header must be removed because of the bug in RabbitMQ.
22+
// It was reported that the bug is fixed since 3.5.4 but I tried with 3.6.1 and the bug still there.
23+
// https://github.com/rabbitmq/rabbitmq-server/issues/216
24+
unset($properties['x-death']);
25+
26+
$delayMessage = $context->createMessage($message->getBody(), $properties, $message->getHeaders());
27+
$delayMessage->setExpiration((int) $delayMsec);
28+
$delayMessage->setRoutingKey($message->getRoutingKey());
29+
1930
if ($dest instanceof AmqpTopic) {
20-
$delayQueue = $context->createQueue($dest->getTopicName().'.'.$delayMsec.'.x.delayed');
31+
$routingKey = $message->getRoutingKey() ? '.'.$message->getRoutingKey() : '';
32+
$name = sprintf('enqueue.%s%s.%s.x.delay', $dest->getTopicName(), $routingKey, $delayMsec);
33+
34+
$delayQueue = $context->createQueue($name);
2135
$delayQueue->addFlag(AmqpTopic::FLAG_DURABLE);
2236
$delayQueue->setArgument('x-dead-letter-exchange', $dest->getTopicName());
37+
$delayQueue->setArgument('x-dead-letter-routing-key', (string) $delayMessage->getRoutingKey());
2338
} elseif ($dest instanceof AmqpQueue) {
24-
$delayQueue = $context->createQueue($dest->getQueueName().'.'.$delayMsec.'.delayed');
39+
$delayQueue = $context->createQueue('enqueue.'.$dest->getQueueName().'.'.$delayMsec.'.delayed');
2540
$delayQueue->addFlag(AmqpTopic::FLAG_DURABLE);
2641
$delayQueue->setArgument('x-dead-letter-exchange', '');
2742
$delayQueue->setArgument('x-dead-letter-routing-key', $dest->getQueueName());
@@ -34,16 +49,6 @@ public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMe
3449

3550
$context->declareQueue($delayQueue);
3651

37-
$properties = $message->getProperties();
38-
39-
// The x-death header must be removed because of the bug in RabbitMQ.
40-
// It was reported that the bug is fixed since 3.5.4 but I tried with 3.6.1 and the bug still there.
41-
// https://github.com/rabbitmq/rabbitmq-server/issues/216
42-
unset($properties['x-death']);
43-
44-
$delayMessage = $context->createMessage($message->getBody(), $properties, $message->getHeaders());
45-
$delayMessage->setExpiration((string) $delayMsec);
46-
4752
$context->createProducer()->send($delayQueue, $delayMessage);
4853
}
4954
}

0 commit comments

Comments
 (0)