From e07cc31cb800c6ec99a23960f78a2e7f968c255b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 18 Feb 2019 14:52:48 +0000 Subject: [PATCH 1/3] 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 6eddb10e0..d9d65347b 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 From 2f16857ca97818052040ed6f8a0376885ef075bf Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 18 Feb 2019 14:54:02 +0000 Subject: [PATCH 2/3] Newsfile --- changelog.d/4668.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4668.misc diff --git a/changelog.d/4668.misc b/changelog.d/4668.misc new file mode 100644 index 000000000..556cdd224 --- /dev/null +++ b/changelog.d/4668.misc @@ -0,0 +1 @@ +Reduce number of exceptions we log From 94960cef037cac1361f42a4ab709b0693ba903ae Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 18 Feb 2019 15:24:13 +0000 Subject: [PATCH 3/3] pep8 --- synapse/handlers/device.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index d9d65347b..c708c35d4 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -20,7 +20,11 @@ from twisted.internet import defer from synapse.api import errors from synapse.api.constants import EventTypes -from synapse.api.errors import FederationDeniedError, RequestSendFailed +from synapse.api.errors import ( + FederationDeniedError, + HttpResponseException, + RequestSendFailed, +) from synapse.types import RoomStreamToken, get_domain_from_id from synapse.util import stringutils from synapse.util.async_helpers import Linearizer