diff options
| author | Erik Johnston <erik@matrix.org> | 2017-06-27 15:53:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-06-27 15:53:45 +0100 |
| commit | 8c23221666f1a09fdc97c2b526cb100cdbd32f60 (patch) | |
| tree | 89cb4b139527f59388026987204e66b878bab931 /synapse/storage | |
| parent | Make workers report to master for user ip updates (diff) | |
| download | synapse-8c23221666f1a09fdc97c2b526cb100cdbd32f60.tar.xz | |
Fix up
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/client_ips.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/storage/client_ips.py b/synapse/storage/client_ips.py index 88a5eb232f..5a88e242e5 100644 --- a/synapse/storage/client_ips.py +++ b/synapse/storage/client_ips.py @@ -58,9 +58,11 @@ class ClientIpStore(background_updates.BackgroundUpdateStore): ) reactor.addSystemEventTrigger("before", "shutdown", self._update_client_ips_batch) - def insert_client_ip(self, user, access_token, ip, user_agent, device_id): - now = int(self._clock.time_msec()) - key = (user.to_string(), access_token, ip) + def insert_client_ip(self, user_id, access_token, ip, user_agent, device_id, + now=None): + if not now: + now = int(self._clock.time_msec()) + key = (user_id, access_token, ip) try: last_seen = self.client_ip_last_seen.get(key) |