Allow usage of different routing keys in all msg producers; fix a buu…

…g with the http-request msg producer
kaliop-uk · Aug 31, 2015 · b07dba8 · b07dba8
1 parent 6b18aaf
commit b07dba8
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 9 deletions.
diff --git a/Command/QueueConsoleCommandCommand.php b/Command/QueueConsoleCommandCommand.php
@@ -26,6 +26,7 @@ protected function configure()
             ->addArgument('console_command', InputArgument::REQUIRED, 'The console command to execute (string)')
             ->addArgument('argument/option', InputArgument::IS_ARRAY, 'Arguments and options for the executed command. Options use the syntax: option.<opt>.<val>')
             ->addOption('driver', 'b', InputOption::VALUE_OPTIONAL, 'The driver (string), if not default', null)
+            ->addOption('routing-key', 'k', InputOption::VALUE_OPTIONAL, 'The routing key, if needed (string)', null)
             ->addOption('ttl', 't', InputOption::VALUE_OPTIONAL, 'Validity of message (in seconds)', null)
             ->addOption('novalidate', null, InputOption::VALUE_NONE, 'Skip checking if the command is registered with the sf console')
             ->addOption('debug', 'd', InputOption::VALUE_NONE, 'Enable Debugging');
@@ -55,6 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $driverName = $input->getOption('driver');
         $queue = $input->getArgument('queue_name');
+        $key = $input->getOption('routing-key');
         $arguments = $input->getArgument('argument/option');
         // parse arguments to tell options apart
         $options = array();
@@ -75,6 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $command,
                 $arguments,
                 $options,
+                $key,
                 $ttl = $input->getOption('ttl')
             );
 

diff --git a/Service/MessageProducer/ConsoleCommand.php b/Service/MessageProducer/ConsoleCommand.php
@@ -13,7 +13,7 @@
  */
 class ConsoleCommand extends BaseMessageProducer
 {
-    public function publish($command, $arguments = array(), $options = array(), $ttl = null)
+    public function publish($command, $arguments = array(), $options = array(), $routingKey = null, $ttl = null)
     {
         $msg = array(
             'command' => $command,
@@ -27,6 +27,14 @@ public function publish($command, $arguments = array(), $options = array(), $ttl
             // see also http://www.rabbitmq.com/ttl.html
             $extras = array('expiration' => $ttl * 1000);
         }
-        $this->doPublish($msg, str_replace(':', '.', $command), $extras);
+        if ($routingKey === null) {
+            $routingKey = $this->getRoutingKey($command, $arguments = array(), $options);
+        }
+        $this->doPublish($msg, $routingKey, $extras);
+    }
+
+    protected function getRoutingKey($command, $arguments = array(), $options = array())
+    {
+        return str_replace(':', '.', $command);
     }
 }
diff --git a/Service/MessageProducer/HTTPRequest.php b/Service/MessageProducer/HTTPRequest.php
@@ -16,12 +16,13 @@ class HTTPRequest extends BaseMessageProducer
     /**
      * @param string $url
      * @param array $options All CURL options are accepted
+     * @param string $routingKey if null, it will be calculated automatically
      * @param null $ttl
      */
-    public function publish($url, $options = array(), $ttl = null)
+    public function publish($url, $options = array(), $routingKey = null, $ttl = null)
     {
         $msg = array(
-            'url' => $command,
+            'url' => $url,
             'options' => $options
         );
         $extras = array();
@@ -31,6 +32,14 @@ public function publish($url, $options = array(), $ttl = null)
             // see also http://www.rabbitmq.com/ttl.html
             $extras = array('expiration' => $ttl * 1000);
         }
-        $this->doPublish($msg, str_replace(array(':', '/'), '.', $command), $extras);
+        if ($routingKey === null) {
+            $routingKey = $this->getRoutingKey($url, $options);
+        }
+        $this->doPublish($msg, $routingKey, $extras);
+    }
+
+    protected function getRoutingKey($url, $options = array())
+    {
+        return str_replace(array(':', '/'), '.', $url);
     }
 }
diff --git a/Service/MessageProducer/SymfonyService.php b/Service/MessageProducer/SymfonyService.php
@@ -13,7 +13,7 @@
  */
 class SymfonyService extends BaseMessageProducer
 {
-    public function publish($service, $method, $arguments = array(), $ttl = null)
+    public function publish($service, $method, $arguments = array(), $routingKey = null, $ttl = null)
     {
         $msg = array(
             'service' => $service,
@@ -27,6 +27,14 @@ public function publish($service, $method, $arguments = array(), $ttl = null)
             // see also http://www.rabbitmq.com/ttl.html
             $extras = array('expiration' => $ttl * 1000);
         }
-        $this->doPublish($msg, str_replace(':', '.', $service) . '.' . $method, $extras);
+        if ($routingKey === null) {
+            $routingKey = $this->getRoutingKey($service, $method, $arguments);
+        }
+        $this->doPublish($msg, $routingKey, $extras);
+    }
+
+    protected function getRoutingKey($service, $method, $arguments = array())
+    {
+        return str_replace(':', '.', $service) . '.' . $method;
     }
 }
diff --git a/Service/MessageProducer/XmlrpcCall.php b/Service/MessageProducer/XmlrpcCall.php
@@ -13,7 +13,7 @@
  */
 class XmlrpcCall extends BaseMessageProducer
 {
-    public function publish($server, $method, $arguments = array(), $ttl = null)
+    public function publish($server, $method, $arguments = array(), $routingKey = null, $ttl = null)
     {
         $msg = array(
             'server' => $server,
@@ -27,6 +27,14 @@ public function publish($server, $method, $arguments = array(), $ttl = null)
             // see also http://www.rabbitmq.com/ttl.html
             $extras = array('expiration' => $ttl * 1000);
         }
-        $this->doPublish($msg, str_replace(array(':', '/'), '.', $server . '.' . $method), $extras);
+        if ($routingKey === null) {
+            $routingKey = $this->getRoutingKey($server, $method, $arguments);
+        }
+        $this->doPublish($msg, $routingKey, $extras);
+    }
+
+    protected function getRoutingKey($server, $method, $arguments = array())
+    {
+        return str_replace(array(':', '/'), '.', $server . '.' . $method);
     }
 }