diff options
author | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
commit | 07126e43a4db2d898e015186902031c8311093cb (patch) | |
tree | 56c45f6cafd6ceaae2341b07de65c294327cd365 /synapse/crypto/keyclient.py | |
parent | remove white space (diff) | |
parent | fix branch regexp (diff) | |
download | synapse-07126e43a4db2d898e015186902031c8311093cb.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init
Diffstat (limited to 'synapse/crypto/keyclient.py')
-rw-r--r-- | synapse/crypto/keyclient.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py index 57d4665e84..080c81f14b 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py @@ -55,7 +55,7 @@ def fetch_server_key(server_name, tls_client_options_factory, path=KEY_API_V1): raise IOError("Cannot get key for %r" % server_name) except (ConnectError, DomainError) as e: logger.warn("Error getting key for %r: %s", server_name, e) - except Exception as e: + except Exception: logger.exception("Error getting key for %r", server_name) raise IOError("Cannot get key for %r" % server_name) |