Merge branch 'pr-479'

php-enqueue · Aug 4, 2018 · 18c7e4a · 18c7e4a
2 parents 6ca7a14 + b4aaeac
commit 18c7e4a
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/pkg/amqp-ext/AmqpContext.php b/pkg/amqp-ext/AmqpContext.php
@@ -315,7 +315,7 @@ public function subscribe(InteropAmqpConsumer $consumer, callable $callback)
 
         $consumerTag = $extQueue->getConsumerTag();
         $consumer->setConsumerTag($consumerTag);
-        $this->subscribers[$consumerTag] = [$consumer, $callback];
+        $this->subscribers[$consumerTag] = [$consumer, $callback, $extQueue];
     }
 
     /**
@@ -327,15 +327,13 @@ public function unsubscribe(InteropAmqpConsumer $consumer)
             return;
         }
 
-        // seg fault
-//        $consumerTag = $consumer->getConsumerTag();
-//        $consumer->setConsumerTag(null);
-//
-//        $extQueue = new \AMQPQueue($this->getExtChannel());
-//        $extQueue->setName($consumer->getQueue()->getQueueName());
-//
-//        $extQueue->cancel($consumerTag);
-//        unset($this->subscribers[$consumerTag]);
+        $consumerTag = $consumer->getConsumerTag();
+        $consumer->setConsumerTag(null);
+
+        list($consumer, $callback, $extQueue) = $this->subscribers[$consumerTag];
+
+        $extQueue->cancel($consumerTag);
+        unset($this->subscribers[$consumerTag]);
     }
 
     /**