fix vyuldashev#235

Author: vyuldashev

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [10.0.2 (2019-12-13)](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v10.0.1...v10.0.2)
+
+- Finally fix [#235](https://github.com/vyuldashev/laravel-queue-rabbitmq/issues/235)
+
 ## [10.0.1 (2019-12-13)](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v10.0.0...v10.0.1)
 
 - Add missing container instance and connectionName to RabbitMQJob

src/Queue/RabbitMQQueue.php

@@ -60,6 +60,13 @@ class RabbitMQQueue extends Queue implements QueueContract
      */
     protected $boundQueues = [];
 
+    /**
+     * Current job being processed.
+     *
+     * @var RabbitMQJob
+     */
+    protected $currentJob;
+
     public function __construct(
         AbstractConnection $connection,
         string $default
@@ -198,7 +205,7 @@ public function pop($queue = null)
 
             /** @var AMQPMessage|null $message */
             if ($message = $this->channel->basic_get($queue)) {
-                return new RabbitMQJob(
+                return $this->currentJob = new RabbitMQJob(
                     $this->container,
                     $this,
                     $message,
@@ -398,6 +405,10 @@ protected function getRandomId(): string
      */
     public function close(): void
     {
+        if ($this->currentJob) {
+            $this->reject($this->currentJob);
+        }
+
         $this->connection->close();
     }
 }