Merge pull request vyuldashev#59 from Toolstation/toolstation

Corrections for delayed queues

Author: vyuldashev

composer.json

@@ -21,4 +21,4 @@
     }
   },
   "minimum-stability": "stable"
-}
+}

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Jobs/RabbitMQJob.php

@@ -89,10 +89,11 @@ public function release($delay = 0)
 
         $attempts = $this->attempts();
 
-        // write attempts to body
-        $body['data']['attempts'] = $attempts + 1;
+        $job = unserialize($body['data']['command']);
+
+        // write attempts to job
+        $job->attempts = $attempts + 1;
 
-        $job = $body['job'];
         $data = $body['data'];
 
         if ($delay > 0) {

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -185,12 +185,13 @@ private function declareDelayedQueue($destination, $delay)
 	{
 		$delay = $this->getSeconds($delay);
 		$destination = $this->getQueueName($destination);
+		$destinationExchange = $this->configExchange['name'] ?:$destination;
 		$name = $this->getQueueName($destination) . '_deferred_' . $delay;
-		$exchange = $this->configExchange['name'] ?:$name;
+		$exchange = $this->configExchange['name'] ?:$destination;
 
 		// declare exchange
 		$this->channel->exchange_declare(
-            $exchange,
+			$exchange,
 			$this->configExchange['type'],
 			$this->configExchange['passive'],
 			$this->configExchange['durable'],
@@ -199,14 +200,14 @@ private function declareDelayedQueue($destination, $delay)
 
 		// declare queue
 		$this->channel->queue_declare(
-            $name,
+			$name,
 			$this->configQueue['passive'],
 			$this->configQueue['durable'],
 			$this->configQueue['exclusive'],
 			$this->configQueue['auto_delete'],
-			false,
+			false ,
 			new AMQPTable([
-				'x-dead-letter-exchange'    => $destination,
+				'x-dead-letter-exchange'    => $destinationExchange,
 				'x-dead-letter-routing-key' => $destination,
 				'x-message-ttl'             => $delay * 1000,
 			])