summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-05 13:50:15 +0000
committerErik Johnston <erik@matrix.org>2015-02-05 13:50:15 +0000
commite9c85a4d5ab332021f93634182ad8ed93bd0091c (patch)
tree9533d2ddca5a1cca2313a1854c97b627278d036c
parentPass through list of room hosts from room alias query to federation so that i... (diff)
downloadsynapse-e9c85a4d5ab332021f93634182ad8ed93bd0091c.tar.xz
Connection errors in twisted aren't RuntimeErrors
-rw-r--r--synapse/federation/federation_client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 9923b3fc0d..70c9a6f46b 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -270,7 +270,7 @@ class FederationClient(FederationBase):
                 break
             except CodeMessageException:
                 raise
-            except RuntimeError as e:
+            except Exception as e:
                 logger.warn(
                     "Failed to make_join via %s: %s",
                     destination, e.message
@@ -319,7 +319,7 @@ class FederationClient(FederationBase):
                 })
             except CodeMessageException:
                 raise
-            except RuntimeError as e:
+            except Exception as e:
                 logger.warn(
                     "Failed to send_join via %s: %s",
                     destination, e.message