diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-25 18:34:46 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-25 18:34:46 +0100 |
| commit | ab34fdecb777b057a0ec307328f309bb2bdee05c (patch) | |
| tree | 541dc61435b893897e7a46d8f0a69443e18233d7 /synapse/federation/federation_base.py | |
| parent | Add some TODOs (diff) | |
| parent | Merge pull request #1041 from matrix-org/paul/third-party-lookup (diff) | |
| download | synapse-ab34fdecb777b057a0ec307328f309bb2bdee05c.tar.xz | |
Merge branch 'develop' into markjh/direct_to_device
Diffstat (limited to 'synapse/federation/federation_base.py')
| -rw-r--r-- | synapse/federation/federation_base.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index da2f5e8cfd..2339cc9034 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -23,6 +23,7 @@ from synapse.crypto.event_signing import check_event_content_hash from synapse.api.errors import SynapseError from synapse.util import unwrapFirstError +from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred import logging @@ -102,10 +103,10 @@ class FederationBase(object): warn, pdu ) - valid_pdus = yield defer.gatherResults( + valid_pdus = yield preserve_context_over_deferred(defer.gatherResults( deferreds, consumeErrors=True - ).addErrback(unwrapFirstError) + )).addErrback(unwrapFirstError) if include_none: defer.returnValue(valid_pdus) @@ -129,7 +130,7 @@ class FederationBase(object): for pdu in pdus ] - deferreds = self.keyring.verify_json_objects_for_server([ + deferreds = preserve_fn(self.keyring.verify_json_objects_for_server)([ (p.origin, p.get_pdu_json()) for p in redacted_pdus ]) |