summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-11 14:11:10 +0000
committerErik Johnston <erik@matrix.org>2019-03-11 14:11:10 +0000
commit78c563b77ce141f61b13e0a00f16687a15704224 (patch)
tree4c103b38bbad3f7215bc27b7d8e52b88d36ea062 /synapse/crypto
parentMerge pull request #4839 from matrix-org/anoa/no_captcha_tests (diff)
downloadsynapse-78c563b77ce141f61b13e0a00f16687a15704224.tar.xz
Correctly log expected errors when fetching server keys
Diffstat (limited to 'synapse/crypto')
-rw-r--r--synapse/crypto/keyring.py4
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(