summary refs log tree commit diff
path: root/synapse/handlers/e2e_keys.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-27 15:18:21 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-27 15:18:21 +0100
commitf094f715cff95a7cebcbd984dbaccf3f1d81615e (patch)
tree0ffd3f4c45b8b50481713e87a226abb7d1cce35e /synapse/handlers/e2e_keys.py
parentRemove redundant, failing, test (diff)
parentMerge pull request #3794 from matrix-org/erikj/faster_typing (diff)
downloadsynapse-f094f715cff95a7cebcbd984dbaccf3f1d81615e.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors
Diffstat (limited to 'synapse/handlers/e2e_keys.py')
-rw-r--r--synapse/handlers/e2e_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py
index 578e9250fb..9dc46aa15f 100644
--- a/synapse/handlers/e2e_keys.py
+++ b/synapse/handlers/e2e_keys.py
@@ -341,7 +341,7 @@ class E2eKeysHandler(object):
 def _exception_to_failure(e):
     if isinstance(e, CodeMessageException):
         return {
-            "status": e.code, "message": e.message,
+            "status": e.code, "message": str(e),
         }
 
     if isinstance(e, NotRetryingDestination):