[Messenger] unwrap ReceivedMessage in LoggingMiddleware to improve log detail
This commit is contained in:
parent
da4fccd37c
commit
78bb0252b4
@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Messenger\Middleware;
|
namespace Symfony\Component\Messenger\Middleware;
|
||||||
|
|
||||||
|
use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
|
||||||
use Symfony\Component\Messenger\MiddlewareInterface;
|
use Symfony\Component\Messenger\MiddlewareInterface;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
@ -31,28 +32,33 @@ class LoggingMiddleware implements MiddlewareInterface
|
|||||||
*/
|
*/
|
||||||
public function handle($message, callable $next)
|
public function handle($message, callable $next)
|
||||||
{
|
{
|
||||||
$this->logger->debug('Starting handling message {class}', array(
|
$this->logger->debug('Starting handling message {class}', $this->createContext($message));
|
||||||
'message' => $message,
|
|
||||||
'class' => \get_class($message),
|
|
||||||
));
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$result = $next($message);
|
$result = $next($message);
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->logger->warning('An exception occurred while handling message {class}', array(
|
$this->logger->warning('An exception occurred while handling message {class}', array_merge(
|
||||||
'message' => $message,
|
$this->createContext($message),
|
||||||
'exception' => $e,
|
array('exception' => $e)
|
||||||
'class' => \get_class($message),
|
|
||||||
));
|
));
|
||||||
|
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->logger->debug('Finished handling message {class}', array(
|
$this->logger->debug('Finished handling message {class}', $this->createContext($message));
|
||||||
'message' => $message,
|
|
||||||
'class' => \get_class($message),
|
|
||||||
));
|
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function createContext($message): array
|
||||||
|
{
|
||||||
|
if ($message instanceof ReceivedMessage) {
|
||||||
|
$message = $message->getMessage();
|
||||||
|
}
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'message' => $message,
|
||||||
|
'class' => \get_class($message),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user