summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-03-23 00:15:58 +0000
committerRichard van der Hoff <richard@matrix.org>2017-03-23 00:16:43 +0000
commite08f81d96a421df97c101461e19ec766ea606fb7 (patch)
tree6cfa0dffae8d5c8f16ce8d7ec5f13222331fb2e0 /synapse/handlers
parentMerge pull request #2044 from matrix-org/rav/crypto_docs (diff)
downloadsynapse-e08f81d96a421df97c101461e19ec766ea606fb7.tar.xz
Add a missing yield in device key upload
(this would only very very rarely actually be a useful thing, so the main
problem was the logcontext leak...)
Diffstat (limited to 'synapse/handlers')
-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 e40495d1ab..c02d41a74c 100644
--- a/synapse/handlers/e2e_keys.py
+++ b/synapse/handlers/e2e_keys.py
@@ -316,7 +316,7 @@ class E2eKeysHandler(object):
         # old access_token without an associated device_id. Either way, we
         # need to double-check the device is registered to avoid ending up with
         # keys without a corresponding device.
-        self.device_handler.check_device_registered(user_id, device_id)
+        yield self.device_handler.check_device_registered(user_id, device_id)
 
         result = yield self.store.count_e2e_one_time_keys(user_id, device_id)