mirror of
https://github.com/element-hq/synapse
synced 2024-09-01 15:40:20 +00:00
Handle timeouts slightly nicer.
This commit is contained in:
parent
34a7f0ca93
commit
9b18151104
1 changed files with 5 additions and 1 deletions
|
@ -232,7 +232,11 @@ class FederationHandler(BaseHandler):
|
|||
d = defer.Deferred()
|
||||
self.waiting_for_join_list.setdefault((joinee, room_id), []).append(d)
|
||||
reactor.callLater(10, d.cancel)
|
||||
yield d
|
||||
|
||||
try:
|
||||
yield d
|
||||
except defer.CancelledError:
|
||||
raise SynapseError("500", "Unable to join remote room")
|
||||
|
||||
try:
|
||||
yield self.store.store_room(
|
||||
|
|
Loading…
Reference in a new issue