Skip to content

[amqp] fix signal handler if consume called from consume #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2018
Merged

[amqp] fix signal handler if consume called from consume #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions pkg/amqp-bunny/AmqpContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ class AmqpContext implements InteropAmqpContext, DelayStrategyAware
*/
private $subscribers;

/**
* @var SignalSocketHelper
*/
private $signalSocketHandler;

/**
* Callable must return instance of \Bunny\Channel once called.
*
Expand All @@ -85,7 +80,6 @@ public function __construct($bunnyChannel, $config = [])

$this->buffer = new Buffer();
$this->subscribers = [];
$this->signalSocketHandler = new SignalSocketHelper();
}

/**
Expand Down Expand Up @@ -396,18 +390,19 @@ public function consume($timeout = 0)
throw new \LogicException('There is no subscribers. Consider calling basicConsumeSubscribe before consuming');
}

$this->signalSocketHandler->beforeSocket();
$signalHandler = new SignalSocketHelper();
$signalHandler->beforeSocket();

try {
$this->getBunnyChannel()->getClient()->run(0 !== $timeout ? $timeout / 1000 : null);
} catch (ClientException $e) {
if ('stream_select() failed.' == $e->getMessage() && $this->signalSocketHandler->wasThereSignal()) {
if ('stream_select() failed.' == $e->getMessage() && $signalHandler->wasThereSignal()) {
return;
}

throw $e;
} finally {
$this->signalSocketHandler->afterSocket();
$signalHandler->afterSocket();
}
}

Expand Down
13 changes: 4 additions & 9 deletions pkg/amqp-lib/AmqpContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ class AmqpContext implements InteropAmqpContext, DelayStrategyAware
*/
private $subscribers;

/**
* @var SignalSocketHelper
*/
private $signalSocketHandler;

/**
* @param AbstractConnection $connection
* @param array $config
Expand All @@ -78,7 +73,6 @@ public function __construct(AbstractConnection $connection, $config = [])
$this->connection = $connection;
$this->buffer = new Buffer();
$this->subscribers = [];
$this->signalSocketHandler = new SignalSocketHelper();
}

/**
Expand Down Expand Up @@ -390,7 +384,8 @@ public function consume($timeout = 0)
throw new \LogicException('There is no subscribers. Consider calling basicConsumeSubscribe before consuming');
}

$this->signalSocketHandler->beforeSocket();
$signalHandler = new SignalSocketHelper();
$signalHandler->beforeSocket();

try {
while (true) {
Expand All @@ -413,13 +408,13 @@ public function consume($timeout = 0)
} catch (AMQPTimeoutException $e) {
} catch (StopBasicConsumptionException $e) {
} catch (AMQPIOWaitException $e) {
if ($this->signalSocketHandler->wasThereSignal()) {
if ($signalHandler->wasThereSignal()) {
return;
}

throw $e;
} finally {
$this->signalSocketHandler->afterSocket();
$signalHandler->afterSocket();
}
}

Expand Down