From e07cc31cb800c6ec99a23960f78a2e7f968c255b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 18 Feb 2019 14:52:48 +0000
Subject: [PATCH] Correctly handle HttpResponseException
---
synapse/handlers/device.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 6eddb10e0d..d9d65347bc 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -504,13 +504,13 @@ class DeviceListEduUpdater(object):
origin = get_domain_from_id(user_id)
try:
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
# later
logger.warn(
- "Failed to handle device list update for %s,"
- " we're not retrying the remote",
- user_id,
+ "Failed to handle device list update for %s", user_id,
)
# We abort on exceptions rather than accepting the update
# as otherwise synapse will 'forget' that its device list
--
GitLab