diff options
author | Erik Johnston <erik@matrix.org> | 2019-02-14 13:58:52 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-02-14 14:01:04 +0000 |
commit | 7fc1196a362fc56d11e2652ee5c9699b1198cf40 (patch) | |
tree | fac7a253674cb2039c82bcc2eb58fea8b6bc3881 /synapse/handlers/device.py | |
parent | Merge pull request #4450 from 14mRh4X0r/fix-dependency-message (diff) | |
download | synapse-7fc1196a362fc56d11e2652ee5c9699b1198cf40.tar.xz |
Correctly handle RequestSendFailed exceptions
This mainly reduces the number of exceptions we log.
Diffstat (limited to 'synapse/handlers/device.py')
-rw-r--r-- | synapse/handlers/device.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 8955cde4ed..6eddb10e0d 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -20,7 +20,7 @@ from twisted.internet import defer from synapse.api import errors from synapse.api.constants import EventTypes -from synapse.api.errors import FederationDeniedError +from synapse.api.errors import FederationDeniedError, RequestSendFailed from synapse.types import RoomStreamToken, get_domain_from_id from synapse.util import stringutils from synapse.util.async_helpers import Linearizer @@ -504,7 +504,7 @@ class DeviceListEduUpdater(object): origin = get_domain_from_id(user_id) try: result = yield self.federation.query_user_devices(origin, user_id) - except NotRetryingDestination: + except (NotRetryingDestination, RequestSendFailed): # TODO: Remember that we are now out of sync and try again # later logger.warn( |