summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-05 17:09:13 +0000
committerErik Johnston <erik@matrix.org>2015-03-05 17:09:13 +0000
commit5b5c7a28d675f2c9a055153089aab96cac28c523 (patch)
tree2ac9e06f947652299cde70985aa68a10e15663d7 /synapse
parentMerge pull request #100 from matrix-org/missing_pdu_compat (diff)
downloadsynapse-5b5c7a28d675f2c9a055153089aab96cac28c523.tar.xz
Log error message when we fail to fetch remote server keys
Diffstat (limited to 'synapse')
-rw-r--r--synapse/crypto/keyring.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py

index 828aced44a..f4db7b8a05 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py
@@ -50,18 +50,27 @@ class Keyring(object): ) try: verify_key = yield self.get_server_verify_key(server_name, key_ids) - except IOError: + except IOError as e: + logger.warn( + "Got IOError when downloading keys for %s: %s %s", + server_name, type(e).__name__, str(e.message), + ) raise SynapseError( 502, "Error downloading keys for %s" % (server_name,), Codes.UNAUTHORIZED, ) - except: + except Exception as e: + logger.warn( + "Got Exception when downloading keys for %s: %s %s", + server_name, type(e).__name__, str(e.message), + ) raise SynapseError( 401, "No key for %s with id %s" % (server_name, key_ids), Codes.UNAUTHORIZED, ) + try: verify_signed_json(json_object, server_name, verify_key) except: