From cca0bea69a27172a6642419a0a90f38c94f6ac5f Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 4 Nov 2025 13:32:40 -0600 Subject: [PATCH 1/2] Be careful with logcontext in `DeferredEvent` --- synapse/util/async_helpers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py index 99e899d1ef9..35c4b815349 100644 --- a/synapse/util/async_helpers.py +++ b/synapse/util/async_helpers.py @@ -1029,7 +1029,8 @@ def __init__(self, clock: Clock) -> None: def set(self) -> None: if not self._deferred.called: - self._deferred.callback(None) + with PreserveLoggingContext(): + self._deferred.callback(None) def clear(self) -> None: if self._deferred.called: From a42320cc82dfeeb061c24862e14ce6c755cee374 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 4 Nov 2025 13:38:05 -0600 Subject: [PATCH 2/2] Add changelog --- changelog.d/19142.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/19142.misc diff --git a/changelog.d/19142.misc b/changelog.d/19142.misc new file mode 100644 index 00000000000..5904f04ae8c --- /dev/null +++ b/changelog.d/19142.misc @@ -0,0 +1 @@ +Respect logcontext in `DeferredEvent`.