diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-09-25 11:50:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 11:50:11 +0100 |
commit | 94133d7ce8ab8dca8b8f47c0f2666d59486884a5 (patch) | |
tree | d472d3d5530e45eee0c156a0446bf42da0a81288 /synapse/rest/client/v2_alpha/sync.py | |
parent | Fix iteration of requests_missing_keys; list doesn't have .values() (diff) | |
parent | Fix logcontxt leak in keyclient (#2465) (diff) | |
download | synapse-94133d7ce8ab8dca8b8f47c0f2666d59486884a5.tar.xz |
Merge branch 'develop' into develop
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
-rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 6dcc407451..978af9c280 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -110,7 +110,7 @@ class SyncRestServlet(RestServlet): filter_id = parse_string(request, "filter", default=None) full_state = parse_boolean(request, "full_state", default=False) - logger.info( + logger.debug( "/sync: user=%r, timeout=%r, since=%r," " set_presence=%r, filter_id=%r, device_id=%r" % ( user, timeout, since, set_presence, filter_id, device_id @@ -189,7 +189,8 @@ class SyncRestServlet(RestServlet): "account_data": {"events": sync_result.account_data}, "to_device": {"events": sync_result.to_device}, "device_lists": { - "changed": list(sync_result.device_lists), + "changed": list(sync_result.device_lists.changed), + "left": list(sync_result.device_lists.left), }, "presence": SyncRestServlet.encode_presence( sync_result.presence, time_now |