summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-08-01 13:14:08 +0100
committerGitHub <noreply@github.com>2019-08-01 13:14:08 +0100
commit0f632f3a5756cc4c3402b949eb64640b9431cf97 (patch)
treea18a283ef0a2a636b1a00ef2a4c3f4b85c9ad98c /synapse/handlers/federation.py
parentMerge pull request #5804 from matrix-org/erikj/match_against_state_key (diff)
parentNewsfile (diff)
downloadsynapse-0f632f3a5756cc4c3402b949eb64640b9431cf97.tar.xz
Merge pull request #5790 from matrix-org/erikj/groups_request_errors
Handle RequestSendFailed exception correctly in more places.
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 10160bfe86..c86903b98b 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -978,6 +978,9 @@ class FederationHandler(BaseHandler):
                 except NotRetryingDestination as e:
                     logger.info(str(e))
                     continue
+                except RequestSendFailed as e:
+                    logger.info("Falied to get backfill from %s because %s", dom, e)
+                    continue
                 except FederationDeniedError as e:
                     logger.info(e)
                     continue