Skip to content

[consumption] Fix signal handling when AMQP is used. #310

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 4, 2018
Merged

[consumption] Fix signal handling when AMQP is used. #310

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
70 changes: 36 additions & 34 deletions pkg/enqueue/Consumption/QueueConsumer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,39 +168,47 @@ public function consume(ExtensionInterface $runtimeExtension = null)
$logger = $context->getLogger() ?: new NullLogger();
$logger->info('Start consuming');

while (true) {
try {
if ($this->psrContext instanceof AmqpContext) {
$callback = function (AmqpMessage $message, AmqpConsumer $consumer) use ($extension, $logger, &$context) {
$currentProcessor = null;
if ($this->psrContext instanceof AmqpContext) {
$callback = function (AmqpMessage $message, AmqpConsumer $consumer) use ($extension, $logger, &$context) {
$currentProcessor = null;

/** @var PsrQueue $queue */
foreach ($this->boundProcessors as list($queue, $processor)) {
if ($queue->getQueueName() === $consumer->getQueue()->getQueueName()) {
$currentProcessor = $processor;
}
}

/** @var PsrQueue $queue */
foreach ($this->boundProcessors as list($queue, $processor)) {
if ($queue->getQueueName() === $consumer->getQueue()->getQueueName()) {
$currentProcessor = $processor;
}
}
if (false == $currentProcessor) {
throw new \LogicException(sprintf('The processor for the queue "%s" could not be found.', $consumer->getQueue()->getQueueName()));
}

if (false == $currentProcessor) {
throw new \LogicException(sprintf('The processor for the queue "%s" could not be found.', $consumer->getQueue()->getQueueName()));
}
$context = new Context($this->psrContext);
$context->setLogger($logger);
$context->setPsrQueue($consumer->getQueue());
$context->setPsrConsumer($consumer);
$context->setPsrProcessor($currentProcessor);
$context->setPsrMessage($message);

$context = new Context($this->psrContext);
$context->setLogger($logger);
$context->setPsrQueue($consumer->getQueue());
$context->setPsrConsumer($consumer);
$context->setPsrProcessor($currentProcessor);
$context->setPsrMessage($message);
$this->doConsume($extension, $context);

$this->doConsume($extension, $context);
return true;
};

return true;
};
foreach ($consumers as $consumer) {
/* @var AmqpConsumer $consumer */

foreach ($consumers as $consumer) {
/* @var AmqpConsumer $consumer */
$this->psrContext->subscribe($consumer, $callback);
}
}

$this->psrContext->subscribe($consumer, $callback);
while (true) {
try {
if ($this->psrContext instanceof AmqpContext) {
$extension->onBeforeReceive($context);

if ($context->isExecutionInterrupted()) {
throw new ConsumptionInterruptedException();
}

$this->psrContext->consume($this->receiveTimeout);
Expand Down Expand Up @@ -266,16 +274,14 @@ protected function doConsume(ExtensionInterface $extension, Context $context)
$consumer = $context->getPsrConsumer();
$logger = $context->getLogger();

if (false == $context->getPsrMessage() instanceof AmqpContext) {
$extension->onBeforeReceive($context);
}

if ($context->isExecutionInterrupted()) {
throw new ConsumptionInterruptedException();
}

$message = $context->getPsrMessage();
if (false == $message) {
$extension->onBeforeReceive($context);

if ($message = $consumer->receive($this->receiveTimeout)) {
$context->setPsrMessage($message);
}
Expand Down Expand Up @@ -312,10 +318,6 @@ protected function doConsume(ExtensionInterface $extension, Context $context)
$logger->info(sprintf('Message processed: %s', $context->getResult()));

$extension->onPostReceived($context);

if ($context->getPsrMessage() instanceof AmqpContext) {
$extension->onBeforeReceive($context);
}
} else {
usleep($this->idleTimeout * 1000);
$extension->onIdle($context);
Expand Down