Ensure multiple consumer follows same logic as normal consumer

Author: McSimp

RabbitMq/Consumer.php

@@ -71,29 +71,29 @@ public function delete()
         $this->getChannel()->queue_delete($this->queueOptions['name'], true);
     }
 
-    public function processMessage(AMQPMessage $msg)
+    protected function processMessageQueueCallback(AMQPMessage $msg, $queueName, $callback)
     {
         $this->dispatchEvent(BeforeProcessingMessageEvent::NAME,
             new BeforeProcessingMessageEvent($this, $msg)
         );
         try {
-            $processFlag = call_user_func($this->callback, $msg);
+            $processFlag = call_user_func($callback, $msg);
             $this->handleProcessMessage($msg, $processFlag);
             $this->dispatchEvent(
                 AfterProcessingMessageEvent::NAME,
                 new AfterProcessingMessageEvent($this, $msg)
             );
             $this->logger->debug('Queue message processed', array(
                 'amqp' => array(
-                    'queue' => $this->queueOptions['name'],
+                    'queue' => $queueName,
                     'message' => $msg,
                     'return_code' => $processFlag
                 )
             ));
         } catch (Exception\StopConsumerException $e) {
             $this->logger->info('Consumer requested restart', array(
                 'amqp' => array(
-                    'queue' => $this->queueOptions['name'],
+                    'queue' => $queueName,
                     'message' => $msg,
                     'stacktrace' => $e->getTraceAsString()
                 )
@@ -102,7 +102,7 @@ public function processMessage(AMQPMessage $msg)
         } catch (\Exception $e) {
             $this->logger->error($e->getMessage(), array(
                 'amqp' => array(
-                    'queue' => $this->queueOptions['name'],
+                    'queue' => $queueName,
                     'message' => $msg,
                     'stacktrace' => $e->getTraceAsString()
                 )
@@ -111,14 +111,18 @@ public function processMessage(AMQPMessage $msg)
         } catch (\Error $e) {
             $this->logger->error($e->getMessage(), array(
                 'amqp' => array(
-                    'queue' => $this->queueOptions['name'],
+                    'queue' => $queueName,
                     'message' => $msg,
                     'stacktrace' => $e->getTraceAsString()
                 )
             ));
             throw $e;
         }
+    }
 
+    public function processMessage(AMQPMessage $msg)
+    {
+        $this->processMessageQueueCallback($msg, $this->queueOptions['name'], $this->callback);
     }
 
     protected function handleProcessMessage(AMQPMessage $msg, $processFlag)

RabbitMq/MultipleConsumer.php

@@ -84,9 +84,7 @@ public function processQueueMessage($queueName, AMQPMessage $msg)
             throw new QueueNotFoundException();
         }
 
-        $processFlag = call_user_func($this->queues[$queueName]['callback'], $msg);
-
-        $this->handleProcessMessage($msg, $processFlag);
+        $this->processMessageQueueCallback($msg, $queueName, $this->queues[$queueName]['callback']);
     }
 
     public function stopConsuming()