Handle timeouts slightly nicer.

2014-09-03 19:13:41 +01:00 · 2014-09-03 19:13:41 +01:00 · 9b18151104
parent 34a7f0ca93
commit 9b18151104
1 changed files with 5 additions and 1 deletions
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@ -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(