diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-10 13:47:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-10 13:47:45 +0100 |
| commit | 8c3a62b5c75920acbbcdcfd889228160c2a60ef5 (patch) | |
| tree | 33d85a573bceaa38e57d9032b0e0570f38afaf40 /synapse/storage/__init__.py | |
| parent | Merge pull request #212 from matrix-org/erikj/cache_deferreds (diff) | |
| parent | Rename keyargs to args in CacheDescriptor (diff) | |
| download | synapse-8c3a62b5c75920acbbcdcfd889228160c2a60ef5.tar.xz | |
Merge pull request #215 from matrix-org/erikj/cache_varargs_interface
Change Cache to not use *args in its interface
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 973e78e047..c6ce65b4cc 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -99,7 +99,7 @@ class DataStore(RoomMemberStore, RoomStore, key = (user.to_string(), access_token, device_id, ip) try: - last_seen = self.client_ip_last_seen.get(*key) + last_seen = self.client_ip_last_seen.get(key) except KeyError: last_seen = None @@ -107,7 +107,7 @@ class DataStore(RoomMemberStore, RoomStore, if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY: defer.returnValue(None) - self.client_ip_last_seen.prefill(*key + (now,)) + self.client_ip_last_seen.prefill(key, now) # It's safe not to lock here: a) no unique constraint, # b) LAST_SEEN_GRANULARITY makes concurrent updates incredibly unlikely |