[fix] remove unused call; remove finally clause; made some methods private

Author: Bogdan Rancichi

Command/BatchConsumerCommand.php

@@ -68,7 +68,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             pcntl_signal(SIGTERM, array(&$this, 'stopConsumer'));
             pcntl_signal(SIGINT, array(&$this, 'stopConsumer'));
-//            pcntl_signal(SIGHUP, array(&$this, 'restartConsumer'));
         }
 
         if (defined('AMQP_DEBUG') === false) {

RabbitMq/BatchConsumer.php

@@ -158,6 +158,7 @@ public function batchConsume()
                     'stacktrace' => $e->getTraceAsString()
                 )
             ));
+            $this->resetBatch();
             throw $e;
         } catch (\Error $e) {
             $this->logger->error($e->getMessage(), array(
@@ -167,10 +168,11 @@ public function batchConsume()
                     'stacktrace' => $e->getTraceAsString()
                 )
             ));
-            throw $e;
-        } finally {
             $this->resetBatch();
+            throw $e;
         }
+
+        $this->resetBatch();
     }
 
     /**
@@ -323,7 +325,7 @@ private function addMessage(AMQPMessage $message)
      *
      * @return  AMQPMessage
      */
-    public function getMessage($deliveryTag)
+    private function getMessage($deliveryTag)
     {
         return isset($this->messages[$deliveryTag])
             ? $this->messages[$deliveryTag]
@@ -338,7 +340,7 @@ public function getMessage($deliveryTag)
      *
      * @throws  AMQPRuntimeException
      */
-    public function getMessageChannel($deliveryTag)
+    private function getMessageChannel($deliveryTag)
     {
         $message = $this->getMessage($deliveryTag);
         if (!$message) {