Merge pull request #365 from shustrik/master

Add shutdown method. When called kernel shutdown, we must close opene…

Author: skafandri

OldSoundRabbitMqBundle.php

@@ -16,4 +16,17 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RegisterPartsPass());
         $container->addCompilerPass(new InjectEventDispatcherPass());
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function shutdown()
+    {
+        parent::shutdown();
+        $partHolder = $this->container->get('old_sound_rabbit_mq.parts_holder');
+        $connections = $partHolder->getParts("old_sound_rabbit_mq.base_amqp");
+        foreach ($connections as $connection) {
+            $connection->close();
+        }
+    }
 }

RabbitMq/BaseAmqp.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace OldSound\RabbitMqBundle\RabbitMq;
+
 use OldSound\RabbitMqBundle\Event\AMQPEvent;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AbstractConnection;
@@ -74,6 +75,11 @@ public function __construct(AbstractConnection $conn, AMQPChannel $ch = null, $c
     }
 
     public function __destruct()
+    {
+        $this->close();
+    }
+
+    public function close()
     {
         if ($this->ch) {
             try {
@@ -115,6 +121,7 @@ public function getChannel()
 
     /**
      * @param  AMQPChannel $ch
+     *
      * @return void
      */
     public function setChannel(AMQPChannel $ch)
@@ -158,6 +165,33 @@ public function setRoutingKey($routingKey)
         $this->routingKey = $routingKey;
     }
 
+    public function setupFabric()
+    {
+        if (!$this->exchangeDeclared) {
+            $this->exchangeDeclare();
+        }
+
+        if (!$this->queueDeclared) {
+            $this->queueDeclare();
+        }
+    }
+
+    /**
+     * disables the automatic SetupFabric when using a consumer or producer
+     */
+    public function disableAutoSetupFabric()
+    {
+        $this->autoSetupFabric = false;
+    }
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function setLogger($logger)
+    {
+        $this->logger = $logger;
+    }
+
     /**
      * Declares exchange
      */
@@ -217,32 +251,6 @@ protected function queueBind($queue, $exchange, $routing_key)
         }
     }
 
-    public function setupFabric()
-    {
-        if (!$this->exchangeDeclared) {
-            $this->exchangeDeclare();
-        }
-
-        if (!$this->queueDeclared) {
-            $this->queueDeclare();
-        }
-    }
-
-    /**
-     * disables the automatic SetupFabric when using a consumer or producer
-     */
-    public function disableAutoSetupFabric() {
-        $this->autoSetupFabric = false;
-    }
-
-    /**
-     * @param LoggerInterface $logger
-     */
-    public function setLogger($logger)
-    {
-        $this->logger = $logger;
-    }
-
     /**
      * @param EventDispatcherInterface $eventDispatcher
      *