summary refs log tree commit diff
path: root/synapse/groups/attestations.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-17 13:54:47 +0100
committerGitHub <noreply@github.com>2019-06-17 13:54:47 +0100
commit6840ebeef84a2f7c06b71124e8b11b9918e41f2e (patch)
tree899c96afb7e87564080143074b0603f5c96f8021 /synapse/groups/attestations.py
parentMerge pull request #5388 from matrix-org/erikj/fix_email_push (diff)
parentHandle failing to talk to master over replication (diff)
downloadsynapse-6840ebeef84a2f7c06b71124e8b11b9918e41f2e.tar.xz
Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions
Handle HttpResponseException when using federation client.
Diffstat (limited to 'synapse/groups/attestations.py')
-rw-r--r--synapse/groups/attestations.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/groups/attestations.py b/synapse/groups/attestations.py

index 469ab8ac7b..3ba74001d8 100644 --- a/synapse/groups/attestations.py +++ b/synapse/groups/attestations.py
@@ -42,7 +42,7 @@ from signedjson.sign import sign_json from twisted.internet import defer -from synapse.api.errors import RequestSendFailed, SynapseError +from synapse.api.errors import HttpResponseException, RequestSendFailed, SynapseError from synapse.metrics.background_process_metrics import run_as_background_process from synapse.types import get_domain_from_id from synapse.util.logcontext import run_in_background @@ -195,7 +195,7 @@ class GroupAttestionRenewer(object): yield self.store.update_attestation_renewal( group_id, user_id, attestation ) - except RequestSendFailed as e: + except (RequestSendFailed, HttpResponseException) as e: logger.warning( "Failed to renew attestation of %r in %r: %s", user_id, group_id, e,