From 740cd61d72eafacd0efb91770b41e65a1558deea Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 27 Sep 2021 19:32:50 +0100 Subject: [PATCH] add event id to logcontext when handling incoming PDUs --- changelog.d/10936.misc | 1 + synapse/federation/federation_server.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelog.d/10936.misc diff --git a/changelog.d/10936.misc b/changelog.d/10936.misc new file mode 100644 index 000000000000..9d1d6e5b02ef --- /dev/null +++ b/changelog.d/10936.misc @@ -0,0 +1 @@ +Include the event id in the logcontext when handling PDUs received over federation. diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 638959cbecdb..83f11d6b8872 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -1008,7 +1008,10 @@ async def _process_incoming_pdus_in_room_inner( async with lock: logger.info("handling received PDU: %s", event) try: - await self._federation_event_handler.on_receive_pdu(origin, event) + with nested_logging_context(event.event_id): + await self._federation_event_handler.on_receive_pdu( + origin, event + ) except FederationError as e: # XXX: Ideally we'd inform the remote we failed to process # the event, but we can't return an error in the transaction