diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-02-18 14:52:23 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-02-18 14:52:23 +0000 |
| commit | 68a53f825fc3ecb415571bda2bfc7c1df5edefb7 (patch) | |
| tree | 8f71f2a3123fe30230d798259eca391794c52d48 /synapse/handlers/device.py | |
| parent | Typo in changelog (diff) | |
| parent | Merge pull request #4643 from matrix-org/erikj/catch_exceptions (diff) | |
| download | synapse-68a53f825fc3ecb415571bda2bfc7c1df5edefb7.tar.xz | |
Merge branch 'develop' into babolivier/acme-delegated
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( |