Merge pull request vyuldashev#130 from lephleg/v4.2

Fixes push performance issue on L4.2.

Author: vyuldashev

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Connectors/RabbitMQConnector.php

@@ -3,7 +3,7 @@
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors;
 
 use Illuminate\Queue\Connectors\ConnectorInterface;
-use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Connection\AMQPStreamConnection as AMQPConnection;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 class RabbitMQConnector implements ConnectorInterface

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -6,7 +6,7 @@
 use Illuminate\Queue\Queue;
 use Illuminate\Queue\QueueInterface;
 use PhpAmqpLib\Channel\AMQPChannel;
-use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Connection\AMQPStreamConnection as AMQPConnection;
 use PhpAmqpLib\Message\AMQPMessage;
 use PhpAmqpLib\Wire\AMQPTable;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
@@ -18,6 +18,8 @@ class RabbitMQQueue extends Queue implements QueueInterface
 	protected $channel;
 
 	protected $defaultQueue;
+    protected $declaredQueues = [];
+    protected $declaredDelayedQueues = [];
 	protected $configQueue;
 	protected $configExchange;
 
@@ -138,11 +140,20 @@ public function getChannel()
 
 	/**
 	 * @param string $name
+     *
+     * @return string
 	 */
 	public function declareQueue($name)
 	{
 		$name = $this->getQueueName($name);
 
+        // if the current queue has been already declared, skip this
+        if (!in_array($name, $this->declaredQueues)) {
+            $this->declaredQueues[]= $name;
+        } else {
+            return $name;
+        }
+
 		// declare queue
 		$this->channel->queue_declare(
 			$name,
@@ -163,6 +174,9 @@ public function declareQueue($name)
 
 		// bind queue to the exchange
 		$this->channel->queue_bind($name, $name, $name);
+
+		return $name;
+
 	}
 
 	/**
@@ -177,6 +191,13 @@ public function declareDelayedQueue($destination, $delay)
 		$destination = $this->getQueueName($destination);
 		$name = $this->getQueueName($destination) . '_deferred_' . $delay;
 
+        // if the current delayed queue has been already declared, skip this
+        if (!in_array($name, $this->declaredDelayedQueues)) {
+            $this->declaredDelayedQueues[]= $name;
+        } else {
+            return $name;
+        }
+
 		// declare exchange
 		$this->channel->exchange_declare(
 			$name,