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

Handle timeouts slightly nicer.

This commit is contained in:
Erik Johnston 2014-09-03 19:13:41 +01:00
parent 34a7f0ca93
commit 9b18151104
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/federation.py
View File

@ -232,7 +232,11 @@ class FederationHandler(BaseHandler):
d = defer.Deferred() d = defer.Deferred()
self.waiting_for_join_list.setdefault((joinee, room_id), []).append(d) self.waiting_for_join_list.setdefault((joinee, room_id), []).append(d)
reactor.callLater(10, d.cancel) reactor.callLater(10, d.cancel)
yield d
try:
yield d
except defer.CancelledError:
raise SynapseError("500", "Unable to join remote room")
try: try:
yield self.store.store_room( yield self.store.store_room(