Merge pull request php-enqueue#771 from snapshotpl/bunny-signal

makasim · web-flow · commit 499360ee85dd · 2019-02-21T09:24:46.000+02:00
Catch signal in Bunny adapter
diff --git a/pkg/amqp-bunny/AmqpSubscriptionConsumer.php b/pkg/amqp-bunny/AmqpSubscriptionConsumer.php
@@ -47,7 +47,7 @@ public function consume(int $timeout = 0): void
         try {
             $this->context->getBunnyChannel()->getClient()->run(0 !== $timeout ? $timeout / 1000 : null);
         } catch (ClientException $e) {
-            if ('stream_select() failed.' == $e->getMessage() && $signalHandler->wasThereSignal()) {
+            if (0 === strpos($e->getMessage(), 'stream_select() failed') && $signalHandler->wasThereSignal()) {
                 return;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function consume(int $timeout = 0): void`
`47`	`47`	`try {`
`48`	`48`	`$this->context->getBunnyChannel()->getClient()->run(0 !== $timeout ? $timeout / 1000 : null);`
`49`	`49`	`} catch (ClientException $e) {`
`50`		`- if ('stream_select() failed.' == $e->getMessage() && $signalHandler->wasThereSignal()) {`
	`50`	`+ if (0 === strpos($e->getMessage(), 'stream_select() failed') && $signalHandler->wasThereSignal()) {`
`51`	`51`	`return;`
`52`	`52`	`}`
`53`	`53`