diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-05-09 19:01:39 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-05-09 19:04:56 +0100 |
| commit | de042b3b885aba6b1508ca50e033fb7a95893553 (patch) | |
| tree | 0eaceeb94ba1db8829e7a11e7632a85745dda87d /synapse | |
| parent | Allow clients to upload one-time-keys with new sigs (diff) | |
| download | synapse-de042b3b885aba6b1508ca50e033fb7a95893553.tar.xz | |
Do some logging when one-time-keys get claimed
might help us figure out if https://github.com/vector-im/riot-web/issues/3868 has happened.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/federation/federation_server.py | 10 | ||||
| -rw-r--r-- | synapse/handlers/e2e_keys.py | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index bc20b9c201..51e3fdea06 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -440,6 +440,16 @@ class FederationServer(FederationBase): key_id: json.loads(json_bytes) } + logger.info( + "Claimed one-time-keys: %s", + ",".join(( + "%s for %s:%s" % (key_id, user_id, device_id) + for user_id, user_keys in json_result.iteritems() + for device_id, device_keys in user_keys.iteritems() + for key_id, _ in device_keys.iteritems() + )), + ) + defer.returnValue({"one_time_keys": json_result}) @defer.inlineCallbacks diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 9d994a8f71..73921a5307 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -262,6 +262,16 @@ class E2eKeysHandler(object): for destination in remote_queries ])) + logger.info( + "Claimed one-time-keys: %s", + ",".join(( + "%s for %s:%s" % (key_id, user_id, device_id) + for user_id, user_keys in json_result.iteritems() + for device_id, device_keys in user_keys.iteritems() + for key_id, _ in device_keys.iteritems() + )), + ) + defer.returnValue({ "one_time_keys": json_result, "failures": failures |