Skip to content

Commit 7a82043

Browse files
committed
client fixes
1 parent 3bbebcb commit 7a82043

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ public function __construct(DriverInterface $driver)
2525
$this->driver = $driver;
2626
}
2727

28-
/**
29-
* {@inheritdoc}
30-
*/
3128
public function onPreReceived(Context $context)
3229
{
3330
$message = $context->getPsrMessage();
@@ -43,5 +40,10 @@ public function onPreReceived(Context $context)
4340

4441
// RouterProcessor is our default message processor when that header is not set
4542
$message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $config->getRouterProcessorName());
43+
44+
$context->getLogger()->debug(
45+
'[SetRouterPropertiesExtension] '.
46+
sprintf('Set router processor "%s"', $config->getRouterProcessorName())
47+
);
4648
}
4749
}

pkg/enqueue/Client/Driver/GenericDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function sendToProcessor(Message $message): void
7373
throw new \LogicException(sprintf('There is no route for topic "%s" and processor "%s"', $topic, $processor));
7474
}
7575

76-
$message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $this->config->getRouterProcessorName());
76+
$message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $route->getProcessor());
7777
$queue = $this->createRouteQueue($route);
7878
} elseif ($topic && false == $message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
7979
$message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $this->config->getRouterProcessorName());

pkg/enqueue/Client/Producer.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@ private function doSend(Message $message): void
115115
$message->setTimestamp(time());
116116
}
117117

118-
if (!$message->getPriority()) {
119-
$message->setPriority(MessagePriority::NORMAL);
120-
}
121-
122118
$this->extension->onDriverPreSend(new DriverPreSend($message, $this, $this->driver));
123119

124120
if (Message::SCOPE_MESSAGE_BUS == $message->getScope()) {

pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Enqueue\Test\ClassExtensionTrait;
1313
use Interop\Queue\PsrContext;
1414
use PHPUnit\Framework\TestCase;
15+
use Psr\Log\NullLogger;
1516

1617
class SetRouterPropertiesExtensionTest extends TestCase
1718
{
@@ -48,6 +49,7 @@ public function testShouldSetRouterProcessorPropertyIfNotSetAndOnRouterQueue()
4849
$message = new NullMessage();
4950

5051
$context = new Context($this->createPsrContextMock());
52+
$context->setLogger(new NullLogger());
5153
$context->setPsrMessage($message);
5254
$context->setPsrQueue(new NullQueue('test.router-queue'));
5355

pkg/enqueue/Tests/Client/ProducerSendCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function testShouldOverwriteExpectedMessageProperties()
152152
self::assertSame(Message::SCOPE_APP, $message->getScope());
153153
}
154154

155-
public function testShouldSendCommandWithNormalPriorityByDefault()
155+
public function testShouldSendCommandWithoutPriorityByDefault()
156156
{
157157
$message = new Message();
158158

@@ -166,7 +166,7 @@ public function testShouldSendCommandWithNormalPriorityByDefault()
166166
$producer = new Producer($driver, $this->createRpcFactoryMock());
167167
$producer->sendCommand('command', $message);
168168

169-
self::assertSame(MessagePriority::NORMAL, $message->getPriority());
169+
self::assertNull($message->getPriority());
170170
}
171171

172172
public function testShouldSendCommandWithCustomPriority()

pkg/enqueue/Tests/Client/ProducerSendEventTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function testShouldOverwriteTopicProperty()
5959
self::assertEquals($expectedProperties, $message->getProperties());
6060
}
6161

62-
public function testShouldSendEventWithNormalPriorityByDefault()
62+
public function testShouldSendEventWithoutPriorityByDefault()
6363
{
6464
$message = new Message();
6565

@@ -73,7 +73,7 @@ public function testShouldSendEventWithNormalPriorityByDefault()
7373
$producer = new Producer($driver, $this->createRpcFactoryMock());
7474
$producer->sendEvent('topic', $message);
7575

76-
self::assertSame(MessagePriority::NORMAL, $message->getPriority());
76+
self::assertNull($message->getPriority());
7777
}
7878

7979
public function testShouldSendEventWithCustomPriority()

0 commit comments

Comments
 (0)