diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-03-11 17:44:29 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-03-11 17:44:29 +0000 |
| commit | f18dca26daad4b7114716b17b4a9f36a1989f16a (patch) | |
| tree | 73035f6cf11594d02089b5b990be673d7c7849e5 /synapse/crypto/keyring.py | |
| parent | Merge branch 'develop' into anoa/trailing_slashes_client (diff) | |
| parent | Make federation endpoints more tolerant of trailing slashes for some endpoint... (diff) | |
| download | synapse-f18dca26daad4b7114716b17b4a9f36a1989f16a.tar.xz | |
Merge branch 'develop' into anoa/trailing_slashes_client
Diffstat (limited to 'synapse/crypto/keyring.py')
| -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 7474fd515f..0207cd989a 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -686,9 +686,9 @@ def _handle_key_deferred(verify_request): try: with PreserveLoggingContext(): _, key_id, verify_key = yield verify_request.deferred - except (IOError, RequestSendFailed) as e: + except KeyLookupError as e: logger.warn( - "Got IOError when downloading keys for %s: %s %s", + "Failed to download keys for %s: %s %s", server_name, type(e).__name__, str(e), ) raise SynapseError( |