diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-05-10 14:18:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 14:18:40 +0100 |
| commit | 5331cd150afbfbac9c270cbcb54c30b7fcb71c8a (patch) | |
| tree | 7f010ee02e129378116996985b5d01775d8260e1 /synapse/federation/federation_server.py | |
| parent | Merge pull request #2209 from matrix-org/luke/username-availability-post (diff) | |
| parent | Replace some instances of preserve_context_over_deferred (diff) | |
| download | synapse-5331cd150afbfbac9c270cbcb54c30b7fcb71c8a.tar.xz | |
Merge pull request #2206 from matrix-org/rav/one_time_key_upload_change_sig
Allow clients to upload one-time-keys with new sigs
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 10 |
1 files changed, 10 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 |