diff options
| author | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
| commit | 9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6 (patch) | |
| tree | 1034b986ea37a081707b489cb3ebe6e4d584defe /synapse/crypto | |
| parent | Make the logging level configurable (diff) | |
| parent | missing word :| (diff) | |
| download | synapse-9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/crypto')
| -rw-r--r-- | synapse/crypto/keyring.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 35f810b07b..fce83d445f 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -352,7 +352,7 @@ class Keyring(object): logger.exception( "Unable to get key from %r: %s %s", perspective_name, - type(e).__name__, str(e.message), + type(e).__name__, str(e), ) defer.returnValue({}) @@ -384,7 +384,7 @@ class Keyring(object): logger.info( "Unable to get key %r for %r directly: %s %s", key_ids, server_name, - type(e).__name__, str(e.message), + type(e).__name__, str(e), ) if not keys: @@ -734,7 +734,7 @@ def _handle_key_deferred(verify_request): except IOError as e: logger.warn( "Got IOError when downloading keys for %s: %s %s", - server_name, type(e).__name__, str(e.message), + server_name, type(e).__name__, str(e), ) raise SynapseError( 502, @@ -744,7 +744,7 @@ def _handle_key_deferred(verify_request): except Exception as e: logger.exception( "Got Exception when downloading keys for %s: %s %s", - server_name, type(e).__name__, str(e.message), + server_name, type(e).__name__, str(e), ) raise SynapseError( 401, |