summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-06-03 14:12:13 +0100
committerGitHub <noreply@github.com>2020-06-03 14:12:13 +0100
commit11dc2b46983ea0cf2a59f3deb66ebd22db223a80 (patch)
treec0d9d79a9947a165269f57225b5a0e6fce8a5384 /synapse
parent`synctl restart` should start synapse if it wasn't running (#7624) (diff)
downloadsynapse-11dc2b46983ea0cf2a59f3deb66ebd22db223a80.tar.xz
Fix exceptions when fetching events from a down host. (#7622)
We already caught some exceptions, but not all.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 75ec90d267..3e60774b33 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -501,7 +501,7 @@ class FederationHandler(BaseHandler):
                 min_depth=min_depth,
                 timeout=60000,
             )
-        except RequestSendFailed as e:
+        except (RequestSendFailed, HttpResponseException, NotRetryingDestination) as e:
             # We failed to get the missing events, but since we need to handle
             # the case of `get_missing_events` not returning the necessary
             # events anyway, it is safe to simply log the error and continue.