From e9c85a4d5ab332021f93634182ad8ed93bd0091c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 5 Feb 2015 13:50:15 +0000
Subject: [PATCH] Connection errors in twisted aren't RuntimeErrors

---
 synapse/federation/federation_client.py | 4 ++--
 1 file 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
-- 
GitLab