diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-27 15:08:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 15:08:32 +0100 |
| commit | 816605a1376c9686557edf08c24280950214184f (patch) | |
| tree | f5c3a1983ab0a0c803218d5eada73299ecae316c /synapse/handlers | |
| parent | Merge pull request #2290 from matrix-org/erikj/ensure_round_trip (diff) | |
| parent | Fix up client ips to read from pending data (diff) | |
| download | synapse-816605a1376c9686557edf08c24280950214184f.tar.xz | |
Merge pull request #2307 from matrix-org/erikj/user_ip_batch
Batch upsert user ips
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/device.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 982cda3edf..ed60d494ff 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -106,7 +106,7 @@ class DeviceHandler(BaseHandler): device_map = yield self.store.get_devices_by_user(user_id) ips = yield self.store.get_last_client_ip_by_device( - devices=((user_id, device_id) for device_id in device_map.keys()) + user_id, device_id=None ) devices = device_map.values() @@ -133,7 +133,7 @@ class DeviceHandler(BaseHandler): except errors.StoreError: raise errors.NotFoundError ips = yield self.store.get_last_client_ip_by_device( - devices=((user_id, device_id),) + user_id, device_id, ) _update_device_from_client_ips(device, ips) defer.returnValue(device) |