enumag
diff --git a/‎pkg/amqp-bunny/AmqpContext.php
Lines changed: 9 additions & 4 deletions b/‎pkg/amqp-bunny/AmqpContext.php
Lines changed: 9 additions & 4 deletions
diff --git a/‎pkg/amqp-lib/AmqpContext.php
Lines changed: 9 additions & 4 deletions b/‎pkg/amqp-lib/AmqpContext.php
Lines changed: 9 additions & 4 deletions
@@ -55,6 +55,11 @@ class AmqpContext implements InteropAmqpContext, DelayStrategyAware
      */
     private $subscribers;
 
+    /**
+     * @var SignalSocketHelper
+     */
+    private $signalSocketHandler;
+
     /**
      * Callable must return instance of \Bunny\Channel once called.
      *
@@ -80,6 +85,7 @@ public function __construct($bunnyChannel, $config = [])
 
         $this->buffer = new Buffer();
         $this->subscribers = [];
+        $this->signalSocketHandler = new SignalSocketHelper();
     }
 
     /**
@@ -390,19 +396,18 @@ public function consume($timeout = 0)
             throw new \LogicException('There is no subscribers. Consider calling basicConsumeSubscribe before consuming');
         }
 
-        $socketHelper = new SignalSocketHelper();
-        $socketHelper->beforeSocket();
+        $this->signalSocketHandler->beforeSocket();
 
         try {
             $this->getBunnyChannel()->getClient()->run(0 !== $timeout ? $timeout / 1000 : null);
         } catch (ClientException $e) {
-            if ('stream_select() failed.' == $e->getMessage() && $socketHelper->wasThereSignal()) {
+            if ('stream_select() failed.' == $e->getMessage() && $this->signalSocketHandler->wasThereSignal()) {
                 return;
             }
 
             throw $e;
         } finally {
-            $socketHelper->afterSocket();
+            $this->signalSocketHandler->afterSocket();
         }
     }
 
 
@@ -57,6 +57,11 @@ class AmqpContext implements InteropAmqpContext, DelayStrategyAware
      */
     private $subscribers;
 
+    /**
+     * @var SignalSocketHelper
+     */
+    private $signalSocketHandler;
+
     /**
      * @param AbstractConnection $connection
      * @param array              $config
@@ -73,6 +78,7 @@ public function __construct(AbstractConnection $connection, $config = [])
         $this->connection = $connection;
         $this->buffer = new Buffer();
         $this->subscribers = [];
+        $this->signalSocketHandler = new SignalSocketHelper();
     }
 
     /**
@@ -384,8 +390,7 @@ public function consume($timeout = 0)
             throw new \LogicException('There is no subscribers. Consider calling basicConsumeSubscribe before consuming');
         }
 
-        $socketHelper = new SignalSocketHelper();
-        $socketHelper->beforeSocket();
+        $this->signalSocketHandler->beforeSocket();
 
         try {
             while (true) {
@@ -408,13 +413,13 @@ public function consume($timeout = 0)
         } catch (AMQPTimeoutException $e) {
         } catch (StopBasicConsumptionException $e) {
         } catch (AMQPIOWaitException $e) {
-            if ($socketHelper->wasThereSignal()) {
+            if ($this->signalSocketHandler->wasThereSignal()) {
                 return;
             }
 
             throw $e;
         } finally {
-            $socketHelper->afterSocket();
+            $this->signalSocketHandler->afterSocket();
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,11 @@ class AmqpContext implements InteropAmqpContext, DelayStrategyAware`
`55`	`55`	`*/`
`56`	`56`	`private $subscribers;`
`57`	`57`
	`58`	`+ /**`
	`59`	`+ * @var SignalSocketHelper`
	`60`	`+ */`
	`61`	`+ private $signalSocketHandler;`
	`62`	`+`
`58`	`63`	`/**`
`59`	`64`	`* Callable must return instance of \Bunny\Channel once called.`
`60`	`65`	`*`
`@@ -80,6 +85,7 @@ public function __construct($bunnyChannel, $config = [])`
`80`	`85`
`81`	`86`	`$this->buffer = new Buffer();`
`82`	`87`	`$this->subscribers = [];`
	`88`	`+ $this->signalSocketHandler = new SignalSocketHelper();`
`83`	`89`	`}`
`84`	`90`
`85`	`91`	`/**`
`@@ -390,19 +396,18 @@ public function consume($timeout = 0)`
`390`	`396`	`throw new \LogicException('There is no subscribers. Consider calling basicConsumeSubscribe before consuming');`
`391`	`397`	`}`
`392`	`398`
`393`		`- $socketHelper = new SignalSocketHelper();`
`394`		`- $socketHelper->beforeSocket();`
	`399`	`+ $this->signalSocketHandler->beforeSocket();`
`395`	`400`
`396`	`401`	`try {`
`397`	`402`	`$this->getBunnyChannel()->getClient()->run(0 !== $timeout ? $timeout / 1000 : null);`
`398`	`403`	`} catch (ClientException $e) {`
`399`		`- if ('stream_select() failed.' == $e->getMessage() && $socketHelper->wasThereSignal()) {`
	`404`	`+ if ('stream_select() failed.' == $e->getMessage() && $this->signalSocketHandler->wasThereSignal()) {`
`400`	`405`	`return;`
`401`	`406`	`}`
`402`	`407`
`403`	`408`	`throw $e;`
`404`	`409`	`} finally {`
`405`		`- $socketHelper->afterSocket();`
	`410`	`+ $this->signalSocketHandler->afterSocket();`
`406`	`411`	`}`
`407`	`412`	`}`
`408`	`413`