diff options
author | Andrej Shadura <andrewsh@debian.org> | 2020-03-03 18:22:36 +0100 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2020-03-03 18:22:36 +0100 |
commit | cdd787466b82d56b1fd939af76c9aa2caf2b6835 (patch) | |
tree | 8dbc26a0dbb9e0b4f380bddcd2d1d6526dce77ec /synapse/federation | |
parent | 4b3a9670d149fa9e5ccd8427af01c91cb657fbf7 (diff) |
New upstream version 1.11.1
Diffstat (limited to 'synapse/federation')
-rw-r--r-- | synapse/federation/federation_base.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index eea64c1c..9fff6571 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -96,12 +96,14 @@ class FederationBase(object): if not res and pdu.origin != origin: try: - res = yield self.get_pdu( - destinations=[pdu.origin], - event_id=pdu.event_id, - room_version=room_version, - outlier=outlier, - timeout=10000, + res = yield defer.ensureDeferred( + self.get_pdu( + destinations=[pdu.origin], + event_id=pdu.event_id, + room_version=room_version, + outlier=outlier, + timeout=10000, + ) ) except SynapseError: pass |