Move debug into the driver

kaliop-uk · Sep 1, 2015 · ad0cd35 · ad0cd35
1 parent aaeefab
commit ad0cd35
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/Adapter/DriverInterface.php b/Adapter/DriverInterface.php
@@ -44,4 +44,9 @@ public function decodeMessage($msg);
      * @return \Kaliop\QueueingBundle\Queue\QueueManagerInterface
      */
     public function getQueueManager($queueName);
+
+    /**
+     * @param bool $debug
+     */
+    public function setDebug($debug);
 }
diff --git a/Adapter/RabbitMq/Driver.php b/Adapter/RabbitMq/Driver.php
@@ -46,4 +46,15 @@ public function getQueueManager($queueName)
         $mgr->setQueueName($queueName);
         return $mgr;
     }
+
+    /**
+     * @param bool $debug
+     * @todo emit a warning if AMQP_DEBUG is already defined
+     */
+    public function setDebug($debug)
+    {
+        if (defined('AMQP_DEBUG') === false) {
+            define('AMQP_DEBUG', (bool)$debug);
+        }
+    }
 }
diff --git a/Command/ManageDriverCommand.php b/Command/ManageDriverCommand.php
@@ -35,10 +35,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->setOutput($output);
 
-        if (defined('AMQP_DEBUG') === false) {
-            define('AMQP_DEBUG', (bool)$input->getOption('debug'));
-        }
-
         $driverName = $input->getOption('driver');
         $command = $input->getArgument('action');
 

diff --git a/Command/ManageQueueCommand.php b/Command/ManageQueueCommand.php
@@ -36,15 +36,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->setOutput($output);
 
-        if (defined('AMQP_DEBUG') === false) {
-            define('AMQP_DEBUG', (bool)$input->getOption('debug'));
-        }
-
         $driverName = $input->getOption('driver');
         $command = $input->getArgument('action');
         $queue = $input->getArgument('queue_name');
+        $debug = $input->getOption('debug');
 
         $driver = $this->getContainer()->get('kaliop_queueing.driverManager')->getDriver($driverName);
+        if ($debug !== null) {
+            $driver->setDebug($debug);
+        }
         $queueManager = $driver->getQueueManager($queue);
 
         if ($command == 'help') {

diff --git a/Command/QueueConsoleCommandCommand.php b/Command/QueueConsoleCommandCommand.php
@@ -49,15 +49,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        /// @todo move into the driver
-        if (defined('AMQP_DEBUG') === false) {
-            define('AMQP_DEBUG', (bool)$input->getOption('debug'));
-        }
-
         $driverName = $input->getOption('driver');
         $queue = $input->getArgument('queue_name');
         $key = $input->getOption('routing-key');
+        $ttl = $ttl = $input->getOption('ttl');
+        $debug = $input->getOption('debug');
         $arguments = $input->getArgument('argument/option');
+
         // parse arguments to tell options apart
         $options = array();
         foreach ($arguments as $key => $arg) {
@@ -69,6 +67,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $driver = $this->getContainer()->get('kaliop_queueing.driverManager')->getDriver($driverName);
+        if ($debug !== null) {
+            $driver->setDebug($debug);
+        }
         $messageProducer = $this->getContainer()->get('kaliop_queueing.message_producer.console_command');
         $messageProducer->setDriver($driver);
         $messageProducer->setQueueName($queue);
@@ -78,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $arguments,
                 $options,
                 $key,
-                $ttl = $input->getOption('ttl')
+                $ttl
             );
 
             $this->writeln("Command queued for execution" . ($ttl ? ", will be valid for $ttl seconds" : ''));

diff --git a/Command/QueueGenericMessageCommand.php b/Command/QueueGenericMessageCommand.php
@@ -42,20 +42,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->setOutput($output);
 
-        /// @todo move into the driver
-        if (defined('AMQP_DEBUG') === false) {
-            define('AMQP_DEBUG', (bool)$input->getOption('debug'));
-        }
-
         $driverName = $input->getOption('driver');
         $queue = $input->getArgument('queue_name');
         $message = $input->getArgument('message');
         $contentType = $input->getOption('content-type');
         $key = $input->getOption('routing-key');
         $repeat = $input->getOption('repeat');
         $ttl = $input->getOption('ttl');
+        $debug = $input->getOption('debug');
 
         $driver = $this->getContainer()->get('kaliop_queueing.driverManager')->getDriver($driverName);
+        if ($debug !== null) {
+            $driver->setDebug($debug);
+        }
         $messageProducer = $this->getContainer()->get('kaliop_queueing.message_producer.generic_message');
         $messageProducer->setDriver($driver);
         $messageProducer->setQueueName($queue);