1111
1212namespace Symfony \Component \Messenger \Middleware ;
1313
14+ use Symfony \Component \Messenger \Asynchronous \Transport \ReceivedMessage ;
1415use Symfony \Component \Messenger \MiddlewareInterface ;
1516use Psr \Log \LoggerInterface ;
1617
@@ -31,28 +32,33 @@ public function __construct(LoggerInterface $logger)
3132 */
3233public function handle ($ messagecallable $ next
3334 {
34- $ this logger ->debug ('Starting handling message {class} ' ,array (
35- 'message ' =>$ message
36- 'class ' =>\get_class ($ message
37- ));
35+ $ this logger ->debug ('Starting handling message {class} ' ,$ this createContext ($ message
3836
3937try {
4038$ result$ next$ message
4139 }catch (\Throwable $ e
42- $ this logger ->warning ('An exception occurred while handling message {class} ' ,array (
43- 'message ' =>$ message
44- 'exception ' =>$ e
45- 'class ' =>\get_class ($ message
40+ $ this logger ->warning ('An exception occurred while handling message {class} ' ,array_merge (
41+ $ this createContext ($ message
42+ array ('exception ' =>$ e
4643 ));
4744
4845throw $ e
4946 }
5047
51- $ this logger ->debug ('Finished handling message {class} ' ,array (
52- 'message ' =>$ message
53- 'class ' =>\get_class ($ message
54- ));
48+ $ this logger ->debug ('Finished handling message {class} ' ,$ this createContext ($ message
5549
5650return $ result
5751 }
52+
53+ private function createContext ($ messagearray
54+ {
55+ if ($ messageinstanceof ReceivedMessage) {
56+ $ message$ messagegetMessage ();
57+ }
58+
59+ return array (
60+ 'message ' =>$ message
61+ 'class ' =>\get_class ($ message
62+ );
63+ }
5864}