Merge pull request #412 from nfqde/master

stloyd · web-flow · commit c5ee228889c0 · 2016-12-08T13:58:58.000+01:00
Fix for consumer with empty queue not being able to handle SIGTERM and SIGINT
diff --git a/RabbitMq/BaseConsumer.php b/RabbitMq/BaseConsumer.php
@@ -34,9 +34,15 @@ public function start($msgAmount = 0)
         }
     }
 
+    /**
+     * Tell the server you are going to stop consuming.
+     *
+     * It will finish up the last message and not send you any more.
+     */
     public function stopConsuming()
     {
-        $this->getChannel()->basic_cancel($this->getConsumerTag());
+        // This gets stuck and will not exit without the last two parameters set.
+        $this->getChannel()->basic_cancel($this->getConsumerTag(), false, true);
     }
 
     protected function setupConsumer()

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,15 @@ public function start($msgAmount = 0)`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ /**`
	`38`	`+ * Tell the server you are going to stop consuming.`
	`39`	`+ *`
	`40`	`+ * It will finish up the last message and not send you any more.`
	`41`	`+ */`
`37`	`42`	`public function stopConsuming()`
`38`	`43`	`{`
`39`		`- $this->getChannel()->basic_cancel($this->getConsumerTag());`
	`44`	`+ // This gets stuck and will not exit without the last two parameters set.`
	`45`	`+ $this->getChannel()->basic_cancel($this->getConsumerTag(), false, true);`
`40`	`46`	`}`
`41`	`47`
`42`	`48`	`protected function setupConsumer()`