diff options
| author | Erik Johnston <erik@matrix.org> | 2019-02-18 14:52:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-02-18 14:55:09 +0000 |
| commit | e07cc31cb800c6ec99a23960f78a2e7f968c255b (patch) | |
| tree | 85bdf790b5d319bd61d569d9c7e1ba0ced697850 | |
| parent | Merge pull request #4643 from matrix-org/erikj/catch_exceptions (diff) | |
| download | synapse-e07cc31cb800c6ec99a23960f78a2e7f968c255b.tar.xz | |
Correctly handle HttpResponseException
| -rw-r--r-- | synapse/handlers/device.py | 8 |
1 files 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 |