diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-03-20 11:53:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 11:53:36 +0000 |
| commit | eddce9d74abce0e0e65d5292149933ed9bf6025a (patch) | |
| tree | b4db8fbbb01c3ee21724aa5eea4639c01ca23f5e /synapse/handlers | |
| parent | Merge pull request #2025 from matrix-org/rav/no_reset_state_on_rejections (diff) | |
| parent | Stop preserve_fn leaking context into the reactor (diff) | |
| download | synapse-eddce9d74abce0e0e65d5292149933ed9bf6025a.tar.xz | |
Merge pull request #2027 from matrix-org/rav/logcontext_leaks
A few fixes to logcontext things
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 10b2325b27..888dd01240 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -933,8 +933,9 @@ class FederationHandler(BaseHandler): # lots of requests for missing prev_events which we do actually # have. Hence we fire off the deferred, but don't wait for it. - synapse.util.logcontext.reset_context_after_deferred( - self._handle_queued_pdus(room_queue)) + synapse.util.logcontext.preserve_fn(self._handle_queued_pdus)( + room_queue + ) defer.returnValue(True) |