Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-v1.11.1' into develop

This commit is contained in:
Patrick Cloke 2020-02-27 13:47:44 -05:00
parent 2201bc9795 380122866f
commit ab0073a6c0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6996.bugfix Normal file
View File

@ -0,0 +1 @@
Fix bug which caused an error when joining a room, with `'coroutine' object has no attribute 'event_id'`.

4
synapse/federation/federation_base.py
View File

@ -96,13 +96,15 @@ class FederationBase(object):
if not res and pdu.origin != origin: if not res and pdu.origin != origin:
try: try:
res = yield self.get_pdu( res = yield defer.ensureDeferred(
self.get_pdu(
destinations=[pdu.origin], destinations=[pdu.origin],
event_id=pdu.event_id, event_id=pdu.event_id,
room_version=room_version, room_version=room_version,
outlier=outlier, outlier=outlier,
timeout=10000, timeout=10000,
) )
)
except SynapseError: except SynapseError:
pass pass