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/crypto | |
| 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/crypto')
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 3a96980bed..cce40fdd2d 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -35,7 +35,7 @@ from unpaddedbase64 import decode_base64 from twisted.internet import defer -from synapse.api.errors import Codes, SynapseError +from synapse.api.errors import Codes, RequestSendFailed, SynapseError from synapse.util import logcontext, unwrapFirstError from synapse.util.logcontext import ( LoggingContext, @@ -656,7 +656,7 @@ def _handle_key_deferred(verify_request): try: with PreserveLoggingContext(): _, key_id, verify_key = yield verify_request.deferred - except IOError as e: + except (IOError, RequestSendFailed) as e: logger.warn( "Got IOError when downloading keys for %s: %s %s", server_name, type(e).__name__, str(e), |