summary refs log tree commit diff
path: root/synapse/handlers/groups_local.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-02-18 14:52:23 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-02-18 14:52:23 +0000
commit68a53f825fc3ecb415571bda2bfc7c1df5edefb7 (patch)
tree8f71f2a3123fe30230d798259eca391794c52d48 /synapse/handlers/groups_local.py
parentTypo in changelog (diff)
parentMerge pull request #4643 from matrix-org/erikj/catch_exceptions (diff)
downloadsynapse-68a53f825fc3ecb415571bda2bfc7c1df5edefb7.tar.xz
Merge branch 'develop' into babolivier/acme-delegated
Diffstat (limited to 'synapse/handlers/groups_local.py')
-rw-r--r--synapse/handlers/groups_local.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/synapse/handlers/groups_local.py b/synapse/handlers/groups_local.py
index 173315af6c..02c508acec 100644
--- a/synapse/handlers/groups_local.py
+++ b/synapse/handlers/groups_local.py
@@ -20,7 +20,7 @@ from six import iteritems
 
 from twisted.internet import defer
 
-from synapse.api.errors import HttpResponseException, SynapseError
+from synapse.api.errors import HttpResponseException, RequestSendFailed, SynapseError
 from synapse.types import get_domain_from_id
 
 logger = logging.getLogger(__name__)
@@ -46,13 +46,19 @@ def _create_rerouter(func_name):
             # when the remote end responds with things like 403 Not
             # In Group, we can communicate that to the client instead
             # of a 500.
-            def h(failure):
+            def http_response_errback(failure):
                 failure.trap(HttpResponseException)
                 e = failure.value
                 if e.code == 403:
                     raise e.to_synapse_error()
                 return failure
-            d.addErrback(h)
+
+            def request_failed_errback(failure):
+                failure.trap(RequestSendFailed)
+                raise SynapseError(502, "Failed to contact group server")
+
+            d.addErrback(http_response_errback)
+            d.addErrback(request_failed_errback)
             return d
     return f