summary refs log tree commit diff
path: root/synapse/federation/federation_base.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-24 13:25:01 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-24 13:25:01 +0000
commit1bca0d40fc26764478966f62ff68fd2befaeea47 (patch)
tree39878c73bfa8b35fda6b9f0029ac20545d491cff /synapse/federation/federation_base.py
parentPort PresenceHandler to async/await (#6991) (diff)
parentCast a coroutine into a Deferred in the federation base (#6996) (diff)
downloadsynapse-1bca0d40fc26764478966f62ff68fd2befaeea47.tar.xz
Cast a coroutine into a Deferred in the federation base (#6996)
* commit '380122866':
  Cast a coroutine into a Deferred in the federation base (#6996)
Diffstat (limited to 'synapse/federation/federation_base.py')
-rw-r--r--synapse/federation/federation_base.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py

index eea64c1c9f..9fff65716a 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