Skip to content

Commit 640024d

Browse files
committed
[BC break][dbal] Convert EnqueueClient expire to Dbal time to live and back.
1 parent c6636ff commit 640024d

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

Diff for: pkg/dbal/Client/DbalDriver.php

+11-4
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ public function createTransportMessage(Message $message)
7171
$transportMessage->setProperties($properties);
7272
$transportMessage->setMessageId($message->getMessageId());
7373
$transportMessage->setTimestamp($message->getTimestamp());
74-
$transportMessage->setDeliveryDelay($message->getDelay());
75-
$transportMessage->setTimeToLive($message->getExpire());
74+
75+
$delay = $message->getDelay();
76+
$transportMessage->setDeliveryDelay((null === $delay) ? null : ($delay * 1000));
77+
78+
$timeToLive = $message->getExpire();
79+
$transportMessage->setTimeToLive((null === $timeToLive) ? null : ($timeToLive * 1000));
7680
$transportMessage->setReplyTo($message->getReplyTo());
7781
$transportMessage->setCorrelationId($message->getCorrelationId());
7882
if (array_key_exists($message->getPriority(), self::$priorityMap)) {
@@ -98,9 +102,12 @@ public function createClientMessage(PsrMessage $message)
98102
$clientMessage->setContentType($message->getHeader('content_type'));
99103
$clientMessage->setMessageId($message->getMessageId());
100104
$clientMessage->setTimestamp($message->getTimestamp());
105+
101106
$timeToLive = $message->getTimeToLive();
102-
$clientMessage->setExpire((null === $timeToLive) ? null : (int) round($timeToLive));
103-
$clientMessage->setDelay($message->getDeliveryDelay());
107+
$clientMessage->setExpire((null === $timeToLive) ? null : (int) ($timeToLive / 1000));
108+
109+
$delay = $message->getDeliveryDelay();
110+
$clientMessage->setDelay((null === $delay) ? null : (int) ($delay / 1000));
104111
$clientMessage->setReplyTo($message->getReplyTo());
105112
$clientMessage->setCorrelationId($message->getCorrelationId());
106113

Diff for: pkg/dbal/DbalConsumer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ protected function receiveMessage()
163163

164164
$this->dbal->commit();
165165

166-
if (empty($dbalMessage['time_to_live']) || $dbalMessage['time_to_live'] > time()) {
166+
if (empty($dbalMessage['time_to_live']) || ($dbalMessage['time_to_live'] / 1000) > microtime(true)) {
167167
return $this->convertMessage($dbalMessage);
168168
}
169169
} catch (\Exception $e) {

0 commit comments

Comments
 (0)