Skip to content

Commit 0405f4c

Browse files
committed
delay strategy
1 parent b75d2ce commit 0405f4c

1 file changed

Lines changed: 8 additions & 56 deletions

File tree

‎pkg/enqueue/Client/Amqp/RabbitMqDriver.php‎

Lines changed: 8 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,13 @@ public function sendToProcessor(Message $message)
7575

7676
$transportMessage = $this->createTransportMessage($message);
7777
$destination = $this->createQueue($queueName);
78+
$producer = $this->context->createProducer();
7879

7980
if ($message->getDelay()) {
80-
$destination = $this->createDelayedTopic($destination);
81+
$producer->setDeliveryDelay($message->getDelay() * 1000);
8182
}
8283

83-
$this->context->createProducer()->send($destination, $transportMessage);
84+
$producer->send($destination, $transportMessage);
8485
}
8586

8687
/**
@@ -117,11 +118,11 @@ public function createTransportMessage(Message $message)
117118
}
118119

119120
if ($message->getDelay()) {
120-
if (false == $this->config->getTransportOption('delay_plugin_installed', false)) {
121-
throw new LogicException('The message delaying is not supported. In order to use delay feature install RabbitMQ delay plugin.');
121+
if (false == $this->config->getTransportOption('delay_strategy', false)) {
122+
throw new LogicException('The message delaying is not supported. In order to use delay feature install RabbitMQ delay strategy.');
122123
}
123124

124-
$transportMessage->setProperty('x-delay', (string) ($message->getDelay() * 1000));
125+
$transportMessage->setProperty('enqueue.delay', $message->getDelay() * 1000);
125126
}
126127

127128
return $transportMessage;
@@ -144,63 +145,14 @@ public function createClientMessage(PsrMessage $message)
144145
$clientMessage->setPriority($clientPriority);
145146
}
146147

147-
if ($delay = $message->getProperty('x-delay')) {
148+
if ($delay = $message->getProperty('enqueue.delay')) {
148149
if (false == is_numeric($delay)) {
149-
throw new \LogicException(sprintf('x-delay header is not numeric. "%s"', $delay));
150+
throw new \LogicException(sprintf('"enqueue.delay" header is not numeric. "%s"', $delay));
150151
}
151152

152153
$clientMessage->setDelay((int) ((int) $delay) / 1000);
153154
}
154155

155156
return $clientMessage;
156157
}
157-
158-
/**
159-
* {@inheritdoc}
160-
*/
161-
public function setupBroker(LoggerInterface $logger = null)
162-
{
163-
$logger = $logger ?: new NullLogger();
164-
165-
parent::setupBroker($logger);
166-
167-
$log = function ($text, ...$args) use ($logger) {
168-
$logger->debug(sprintf('[RabbitMqDriver] '.$text, ...$args));
169-
};
170-
171-
// setup delay exchanges
172-
if ($this->config->getTransportOption('delay_plugin_installed', false)) {
173-
foreach ($this->queueMetaRegistry->getQueuesMeta() as $meta) {
174-
$queue = $this->createQueue($meta->getClientName());
175-
176-
$delayTopic = $this->createDelayedTopic($queue);
177-
178-
$log('Declare delay exchange: %s', $delayTopic->getTopicName());
179-
$this->context->declareTopic($delayTopic);
180-
181-
$log('Bind processor queue to delay exchange: %s -> %s', $queue->getQueueName(), $delayTopic->getTopicName());
182-
$this->context->bind(new AmqpBind($delayTopic, $queue, $queue->getQueueName()));
183-
}
184-
}
185-
}
186-
187-
/**
188-
* @param AmqpQueue $queue
189-
*
190-
* @return AmqpTopic
191-
*/
192-
private function createDelayedTopic(AmqpQueue $queue)
193-
{
194-
$queueName = $queue->getQueueName();
195-
196-
// in order to use delay feature make sure the rabbitmq_delayed_message_exchange plugin is installed.
197-
$delayTopic = $this->context->createTopic($queueName.'.delayed');
198-
$delayTopic->setType('x-delayed-message');
199-
$delayTopic->addFlag(AmqpTopic::FLAG_DURABLE);
200-
$delayTopic->setArguments([
201-
'x-delayed-type' => 'direct',
202-
]);
203-
204-
return $delayTopic;
205-
}
206158
}

0 commit comments

Comments
 (0)