merge master in current branch

cultuurnet · Oct 25, 2023 · 1a04a64 · 1a04a64
2 parents 054a5e0 + cc7f05c
commit 1a04a64
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/app/ConsoleApplication.php b/app/ConsoleApplication.php
@@ -73,7 +73,8 @@ protected function registerCommands()
         $consoleApp->add(new CacheClearCommand());
 
         $disableDelay = $this['config']['rabbitmq']['disable_delay'] ?? false;
-        $consoleApp->add(new ConsumeCommand('projectaanvraag:consumer', 'rabbit.connection', 'rabbit.consumer', $disableDelay));
+        $exchange = $this['config']['rabbitmq']['exchange'];
+        $consoleApp->add(new ConsumeCommand('projectaanvraag:consumer', 'rabbit.connection', 'rabbit.consumer', $exchange, $disableDelay));
 
         // Sync culturefeed consumers with local DB
         $consoleApp->add(new SyncConsumersCommand());

diff --git a/app/Core/MessageBusProvider.php b/app/Core/MessageBusProvider.php
@@ -120,7 +120,7 @@ public function register(Container $pimple)
                 $producer->setExchangeOptions(
                     [
                         'declare' => true,
-                        'name' => 'main_exchange',
+                        'name' => $pimple['config']['rabbitmq']['exchange'],
                         'type' => 'x-delayed-message',
                         'durable' => true,
                         'arguments' => new AMQPTable(
@@ -134,7 +134,7 @@ public function register(Container $pimple)
                 $producer->setExchangeOptions(
                     [
                         'declare' => true,
-                        'name' => 'main_exchange',
+                        'name' => $pimple['config']['rabbitmq']['exchange'],
                         'type' => 'topic',
                         'durable' => true,
                     ]
@@ -169,7 +169,7 @@ public function register(Container $pimple)
                 )
             );
 
-            $channel->queue_bind('projectaanvraag_failed', 'main_exchange', 'projectaanvraag_failed');
+            $channel->queue_bind('projectaanvraag_failed', $pimple['config']['rabbitmq']['exchange'], 'projectaanvraag_failed');
 
             // Resolvers.
             $routingKeyResolver = new AsyncCommandRoutingKeyResolver();

diff --git a/src/Console/Command/ConsumeCommand.php b/src/Console/Command/ConsumeCommand.php
@@ -27,6 +27,11 @@ class ConsumeCommand extends Command
      */
     protected $connectionId;
 
+    /**
+     * @var string
+     */
+    protected $exchange;
+
     /**
      * @var boolean
      */
@@ -37,13 +42,15 @@ class ConsumeCommand extends Command
      * @param null|string $name
      * @param $connectionId
      * @param $consumerId
+     * @param $exchange
      * @param bool $disableDelay
      */
-    public function __construct($name, $connectionId, $consumerId, $disableDelay = false)
+    public function __construct($name, $connectionId, $consumerId, $exchange, $disableDelay = false)
     {
         parent::__construct($name);
         $this->connectionId = $connectionId;
         $this->consumerId = $consumerId;
+        $this->exchange = $exchange;
         $this->disableDelay = $disableDelay;
     }
 
@@ -81,16 +88,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // Declare the exchange
         if (!$this->disableDelay) {
-            $channel->exchange_declare('main_exchange', 'x-delayed-message', false, true, false, false, false, new AMQPTable(['x-delayed-type' => 'direct']));
+            $channel->exchange_declare($this->exchange, 'x-delayed-message', false, true, false, false, false, new AMQPTable(['x-delayed-type' => 'direct']));
         } else {
-            $channel->exchange_declare('main_exchange', 'topic', false, true, false);
+            $channel->exchange_declare($this->exchange, 'topic', false, true, false);
         }
 
         // Declare the main queue
         $channel->queue_declare('projectaanvraag', false, true, false, false, false, new AMQPTable(['routing_keys' => ['asynchronous_commands']]));
 
         // Bind the queue to the async_commands exchange
-        $channel->queue_bind('projectaanvraag', 'main_exchange', 'asynchronous_commands');
+        $channel->queue_bind('projectaanvraag', $this->exchange, 'asynchronous_commands');
 
         $output->writeln(' [*] Waiting for messages. To exit press CTRL+C');