Skip to content

Ensure multiple consumer follows same processing logic as normal consumer #388

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
Oct 1, 2016
Merged

Ensure multiple consumer follows same processing logic as normal consumer #388

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
16 changes: 10 additions & 6 deletions RabbitMq/Consumer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,29 +71,29 @@ public function delete()
$this->getChannel()->queue_delete($this->queueOptions['name'], true);
}

public function processMessage(AMQPMessage $msg)
protected function processMessageQueueCallback(AMQPMessage $msg, $queueName, $callback)
{
$this->dispatchEvent(BeforeProcessingMessageEvent::NAME,
new BeforeProcessingMessageEvent($this, $msg)
);
try {
$processFlag = call_user_func($this->callback, $msg);
$processFlag = call_user_func($callback, $msg);
$this->handleProcessMessage($msg, $processFlag);
$this->dispatchEvent(
AfterProcessingMessageEvent::NAME,
new AfterProcessingMessageEvent($this, $msg)
);
$this->logger->debug('Queue message processed', array(
'amqp' => array(
'queue' => $this->queueOptions['name'],
'queue' => $queueName,
'message' => $msg,
'return_code' => $processFlag
)
));
} catch (Exception\StopConsumerException $e) {
$this->logger->info('Consumer requested restart', array(
'amqp' => array(
'queue' => $this->queueOptions['name'],
'queue' => $queueName,
'message' => $msg,
'stacktrace' => $e->getTraceAsString()
)
Expand All @@ -102,7 +102,7 @@ public function processMessage(AMQPMessage $msg)
} catch (\Exception $e) {
$this->logger->error($e->getMessage(), array(
'amqp' => array(
'queue' => $this->queueOptions['name'],
'queue' => $queueName,
'message' => $msg,
'stacktrace' => $e->getTraceAsString()
)
Expand All @@ -111,14 +111,18 @@ public function processMessage(AMQPMessage $msg)
} catch (\Error $e) {
$this->logger->error($e->getMessage(), array(
'amqp' => array(
'queue' => $this->queueOptions['name'],
'queue' => $queueName,
'message' => $msg,
'stacktrace' => $e->getTraceAsString()
)
));
throw $e;
}
}

public function processMessage(AMQPMessage $msg)
{
$this->processMessageQueueCallback($msg, $this->queueOptions['name'], $this->callback);
}

protected function handleProcessMessage(AMQPMessage $msg, $processFlag)
Expand Down
4 changes: 1 addition & 3 deletions RabbitMq/MultipleConsumer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ public function processQueueMessage($queueName, AMQPMessage $msg)
throw new QueueNotFoundException();
}

$processFlag = call_user_func($this->queues[$queueName]['callback'], $msg);

$this->handleProcessMessage($msg, $processFlag);
$this->processMessageQueueCallback($msg, $queueName, $this->queues[$queueName]['callback']);
}

public function stopConsuming()
Expand Down