Skip to content

Commit c9cfc72

Browse files
committed
[client] Send exclusive commands to their queues directly, by passing router.
1 parent de1bb8a commit c9cfc72

5 files changed

Lines changed: 47 additions & 10 deletions

File tree

‎pkg/enqueue-bundle/Resources/config/extensions/exclusive_command_extension.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ services:
55
arguments:
66
- []
77
tags:
8-
- { name: 'enqueue.consumption.extension', priority: 100 }
8+
- { name: 'enqueue.consumption.extension', priority: 100 }
9+
- { name: 'enqueue.client.extension', priority: 100 }

‎pkg/enqueue/Client/Config.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
class Config
66
{
77
const PARAMETER_TOPIC_NAME = 'enqueue.topic_name';
8+
const PARAMETER_COMMAND_NAME = 'enqueue.command_name';
89
const PARAMETER_PROCESSOR_NAME = 'enqueue.processor_name';
910
const PARAMETER_PROCESSOR_QUEUE_NAME = 'enqueue.processor_queue_name';
1011
const DEFAULT_PROCESSOR_QUEUE_NAME = 'default';

‎pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,33 @@
33
namespace Enqueue\Client\ConsumptionExtension;
44

55
use Enqueue\Client\Config;
6+
use Enqueue\Client\ExtensionInterface as ClientExtensionInterface;
7+
use Enqueue\Client\Message;
68
use Enqueue\Consumption\Context;
79
use Enqueue\Consumption\EmptyExtensionTrait;
8-
use Enqueue\Consumption\ExtensionInterface;
10+
use Enqueue\Consumption\ExtensionInterface as ConsumptionExtensionInterface;
911

10-
class ExclusiveCommandExtension implements ExtensionInterface
12+
class ExclusiveCommandExtension implements ConsumptionExtensionInterface, ClientExtensionInterface
1113
{
1214
use EmptyExtensionTrait;
1315

1416
/**
15-
* @var array
17+
* @var string[]
1618
*/
1719
private $queueNameToProcessorNameMap;
1820

1921
/**
20-
* @param array $queueNameToProcessorNameMap
22+
* @var string[]
23+
*/
24+
private $processorNameToQueueNameMap;
25+
26+
/**
27+
* @param string[] $queueNameToProcessorNameMap
2128
*/
2229
public function __construct(array $queueNameToProcessorNameMap)
2330
{
2431
$this->queueNameToProcessorNameMap = $queueNameToProcessorNameMap;
32+
$this->processorNameToQueueNameMap = array_flip($queueNameToProcessorNameMap);
2533
}
2634

2735
public function onPreReceived(Context $context)
@@ -47,4 +55,30 @@ public function onPreReceived(Context $context)
4755
$message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $this->queueNameToProcessorNameMap[$queue->getQueueName()]);
4856
}
4957
}
58+
59+
/**
60+
* {@inheritdoc}
61+
*/
62+
public function onPreSend($topic, Message $message)
63+
{
64+
if (Config::COMMAND_TOPIC != $topic) {
65+
return;
66+
}
67+
68+
// if ($message->getProperty(Config::PARAMETER_PROCESSOR_QUEUE_NAME)) {
69+
// return;
70+
// }
71+
72+
$processorName = $message->getProperty(Config::PARAMETER_PROCESSOR_NAME);
73+
if (array_key_exists($processorName, $this->processorNameToQueueNameMap)) {
74+
$message->setProperty(Config::PARAMETER_PROCESSOR_QUEUE_NAME, $this->processorNameToQueueNameMap[$processorName]);
75+
}
76+
}
77+
78+
/**
79+
* {@inheritdoc}
80+
*/
81+
public function onPostSend($topic, Message $message)
82+
{
83+
}
5084
}

‎pkg/enqueue/Client/Producer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function sendCommand($command, $message, $needReply = false)
118118
}
119119

120120
$message->setProperty(Config::PARAMETER_TOPIC_NAME, Config::COMMAND_TOPIC);
121-
$message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $command);
121+
$message->setProperty(Config::PARAMETER_COMMAND_NAME, $command);
122122
$message->setScope(Message::SCOPE_APP);
123123

124124
$this->sendEvent(Config::COMMAND_TOPIC, $message);

‎pkg/enqueue/Client/RouterProcessor.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,18 @@ private function routeEvent(PsrMessage $message)
100100
*/
101101
private function routeCommand(PsrMessage $message)
102102
{
103-
$processorName = $message->getProperty(Config::PARAMETER_PROCESSOR_NAME);
104-
if (false == $processorName) {
103+
$commandName = $message->getProperty(Config::PARAMETER_COMMAND_NAME);
104+
if (false == $commandName) {
105105
return Result::reject(sprintf(
106106
'Got message without required parameter: "%s"',
107107
Config::PARAMETER_PROCESSOR_NAME
108108
));
109109
}
110110

111-
if (isset($this->commandRoutes[$processorName])) {
111+
if (isset($this->commandRoutes[$commandName])) {
112112
$processorMessage = clone $message;
113-
$processorMessage->setProperty(Config::PARAMETER_PROCESSOR_QUEUE_NAME, $this->commandRoutes[$processorName]);
113+
$processorMessage->setProperty(Config::PARAMETER_PROCESSOR_QUEUE_NAME, $this->commandRoutes[$commandName]);
114+
$processorMessage->setProperty(Config::PARAMETER_PROCESSOR_NAME, $commandName);
114115

115116
$this->driver->sendToProcessor($this->driver->createClientMessage($processorMessage));
116117
}

0 commit comments

Comments
 (0)