Skip to content

Commit f9b3260

Browse files
committed
Convert between Message::$expire and DbalMessage::$timeToLive
Fixes a condition which results in the "enqueue" table having a null value for "time_to_live" even though it was set on the Message object prior to sending the event/command.
1 parent 1ee65de commit f9b3260

2 files changed

Lines changed: 25 additions & 2 deletions

File tree

‎pkg/dbal/Client/DbalDriver.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public function createTransportMessage(Message $message)
7272
$transportMessage->setMessageId($message->getMessageId());
7373
$transportMessage->setTimestamp($message->getTimestamp());
7474
$transportMessage->setDeliveryDelay($message->getDelay());
75+
$transportMessage->setTimeToLive($message->getExpire());
7576
$transportMessage->setReplyTo($message->getReplyTo());
7677
$transportMessage->setCorrelationId($message->getCorrelationId());
7778
if (array_key_exists($message->getPriority(), self::$priorityMap)) {
@@ -97,6 +98,8 @@ public function createClientMessage(PsrMessage $message)
9798
$clientMessage->setContentType($message->getHeader('content_type'));
9899
$clientMessage->setMessageId($message->getMessageId());
99100
$clientMessage->setTimestamp($message->getTimestamp());
101+
$timeToLive = $message->getTimeToLive();
102+
$clientMessage->setExpire((null === $timeToLive) ? null : (int) round($timeToLive));
100103
$clientMessage->setDelay($message->getDeliveryDelay());
101104
$clientMessage->setReplyTo($message->getReplyTo());
102105
$clientMessage->setCorrelationId($message->getCorrelationId());

‎pkg/dbal/Tests/Client/DbalDriverTest.php‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public function testShouldConvertTransportMessageToClientMessage()
9494
$transportMessage->setTimestamp(1000);
9595
$transportMessage->setPriority(2);
9696
$transportMessage->setDeliveryDelay(12345);
97+
$transportMessage->setTimeToLive(67890);
9798

9899
$driver = new DbalDriver(
99100
$this->createPsrContextMock(),
@@ -118,11 +119,29 @@ public function testShouldConvertTransportMessageToClientMessage()
118119
$this->assertSame('ContentType', $clientMessage->getContentType());
119120
$this->assertSame(1000, $clientMessage->getTimestamp());
120121
$this->assertSame(12345, $clientMessage->getDelay());
121-
122-
$this->assertNull($clientMessage->getExpire());
122+
$this->assertSame(67890, $clientMessage->getExpire());
123123
$this->assertSame(MessagePriority::NORMAL, $clientMessage->getPriority());
124124
}
125125

126+
public function testShouldRoundTransportMessageTimeToLiveToNearestIntegerWhenConvertingToClientMessage()
127+
{
128+
$driver = new DbalDriver(
129+
$this->createPsrContextMock(),
130+
$this->createDummyConfig(),
131+
$this->createDummyQueueMetaRegistry()
132+
);
133+
134+
$transportMessage = new DbalMessage();
135+
136+
$transportMessage->setTimeToLive(1.4);
137+
$clientMessage = $driver->createClientMessage($transportMessage);
138+
$this->assertSame(1, $clientMessage->getExpire());
139+
140+
$transportMessage->setTimeToLive(1.5);
141+
$clientMessage = $driver->createClientMessage($transportMessage);
142+
$this->assertSame(2, $clientMessage->getExpire());
143+
}
144+
126145
public function testShouldConvertClientMessageToTransportMessage()
127146
{
128147
$clientMessage = new Message();
@@ -163,6 +182,7 @@ public function testShouldConvertClientMessageToTransportMessage()
163182
$this->assertSame([
164183
'key' => 'val',
165184
], $transportMessage->getProperties());
185+
$this->assertSame(123, $transportMessage->getTimeToLive());
166186
$this->assertSame('MessageId', $transportMessage->getMessageId());
167187
$this->assertSame(1000, $transportMessage->getTimestamp());
168188
}

0 commit comments

Comments
 (0)