Correctly handle HttpResponseException

This commit is contained in:
Erik Johnston 2019-02-18 14:52:48 +00:00
parent d1b060b492
commit e07cc31cb8

View File

@ -504,13 +504,13 @@ class DeviceListEduUpdater(object):
origin = get_domain_from_id(user_id) origin = get_domain_from_id(user_id)
try: try:
result = yield self.federation.query_user_devices(origin, user_id) result = yield self.federation.query_user_devices(origin, user_id)
except (NotRetryingDestination, RequestSendFailed): except (
NotRetryingDestination, RequestSendFailed, HttpResponseException,
):
# TODO: Remember that we are now out of sync and try again # TODO: Remember that we are now out of sync and try again
# later # later
logger.warn( logger.warn(
"Failed to handle device list update for %s," "Failed to handle device list update for %s", user_id,
" we're not retrying the remote",
user_id,
) )
# We abort on exceptions rather than accepting the update # We abort on exceptions rather than accepting the update
# as otherwise synapse will 'forget' that its device list # as otherwise synapse will 'forget' that its device list