MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-15 06:21:49 +01:00
Code Issues Projects Releases Wiki Activity

add event id to logcontext when handling incoming PDUs (#10936)

Browse source
This commit is contained in:
Richard van der Hoff 2021-09-29 11:59:43 +01:00 committed by GitHub
parent 94b620a5ed
commit 176aa55fd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/10936.misc Normal file
View file

@ -0,0 +1 @@
Include the event id in the logcontext when handling PDUs received over federation.

5
synapse/federation/federation_server.py
View file

@ -1008,7 +1008,10 @@ class FederationServer(FederationBase):
async with lock: async with lock:
logger.info("handling received PDU: %s", event) logger.info("handling received PDU: %s", event)
try: 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: except FederationError as e:
# XXX: Ideally we'd inform the remote we failed to process # XXX: Ideally we'd inform the remote we failed to process
# the event, but we can't return an error in the transaction # the event, but we can't return an error in the transaction