Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions pkg/enqueue/Consumption/Extension/LogExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function onMessageReceived(MessageReceived $context): void
{
$message = $context->getMessage();

$context->getLogger()->debug("Received from {queueName}\t{body}", [
$context->getLogger()->debug('Received from {queueName}', [
'queueName' => $context->getConsumer()->getQueue()->getQueueName(),
'redelivered' => $message->isRedelivered(),
'body' => Stringify::that($message->getBody()),
Expand All @@ -45,12 +45,13 @@ public function onPostMessageReceived(PostMessageReceived $context): void
$queue = $context->getConsumer()->getQueue();
$result = $context->getResult();

$logMessage = 'Processed from {queueName}';

$reason = '';
$logMessage = "Processed from {queueName}\t{body}\t{result}";
if ($result instanceof Result && $result->getReason()) {
$reason = $result->getReason();
$logMessage .= ' {reason}';
}

$logContext = [
'result' => str_replace('enqueue.', '', $result),
'reason' => $reason,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function testShouldLogMessageReceived()
$logger
->expects($this->once())
->method('debug')
->with('Received from {queueName} {body}', [
->with('Received from {queueName}', [
'queueName' => 'aQueue',
'redelivered' => false,
'body' => Stringify::that('aBody'),
Expand All @@ -118,7 +118,7 @@ public function testShouldLogMessageProcessedWithStringResult()
->expects($this->once())
->method('log')
->with(LogLevel::INFO,
'Processed from {queueName} {body} {result}',
'Processed from {queueName}',
[
'queueName' => 'aQueue',
'body' => Stringify::that('aBody'),
Expand Down Expand Up @@ -148,7 +148,7 @@ public function testShouldLogRejectedMessageAsError()
->expects($this->once())
->method('log')
->with(LogLevel::ERROR,
'Processed from {queueName} {body} {result}',
'Processed from {queueName}',
[
'queueName' => 'aQueue',
'body' => Stringify::that('aBody'),
Expand Down Expand Up @@ -178,7 +178,7 @@ public function testShouldLogMessageProcessedWithResultObject()
->expects($this->once())
->method('log')
->with(LogLevel::INFO,
'Processed from {queueName} {body} {result}',
'Processed from {queueName}',
[
'queueName' => 'aQueue',
'body' => Stringify::that('aBody'),
Expand Down Expand Up @@ -208,7 +208,7 @@ public function testShouldLogMessageProcessedWithReasonResultObject()
->expects($this->once())
->method('log')
->with(LogLevel::INFO,
'Processed from {queueName} {body} {result} {reason}',
'Processed from {queueName}',
[
'queueName' => 'aQueue',
'body' => Stringify::that('aBody'),
Expand Down
10 changes: 5 additions & 5 deletions pkg/enqueue/Tests/Consumption/Extension/LogExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function testShouldLogMessageReceived()
$logger
->expects($this->once())
->method('debug')
->with('Received from {queueName} {body}', [
->with('Received from {queueName}', [
'queueName' => 'aQueue',
'redelivered' => false,
'body' => Stringify::that('aBody'),
Expand All @@ -112,7 +112,7 @@ public function testShouldLogMessageProcessedWithStringResult()
->expects($this->once())
->method('log')
->with(LogLevel::INFO,
'Processed from {queueName} {body} {result}',
'Processed from {queueName}',
[
'queueName' => 'aQueue',
'body' => Stringify::that('aBody'),
Expand Down Expand Up @@ -142,7 +142,7 @@ public function testShouldLogRejectedMessageAsError()
->expects($this->once())
->method('log')
->with(LogLevel::ERROR,
'Processed from {queueName} {body} {result}',
'Processed from {queueName}',
[
'queueName' => 'aQueue',
'body' => Stringify::that('aBody'),
Expand Down Expand Up @@ -172,7 +172,7 @@ public function testShouldLogMessageProcessedWithResultObject()
->expects($this->once())
->method('log')
->with(LogLevel::INFO,
'Processed from {queueName} {body} {result}',
'Processed from {queueName}',
[
'queueName' => 'aQueue',
'body' => Stringify::that('aBody'),
Expand Down Expand Up @@ -202,7 +202,7 @@ public function testShouldLogMessageProcessedWithReasonResultObject()
->expects($this->once())
->method('log')
->with(LogLevel::INFO,
'Processed from {queueName} {body} {result} {reason}',
'Processed from {queueName}',
[
'queueName' => 'aQueue',
'body' => Stringify::that('aBody'),
Expand Down
Loading