|
@@ -15,7 +15,7 @@
|
|
|
|
|
|
from synapse.storage.database import DatabasePool
|
|
|
from synapse.storage.databases.main.client_ips import LAST_SEEN_GRANULARITY
|
|
|
-from synapse.util.caches.deferred_cache import DeferredCache
|
|
|
+from synapse.util.caches.lrucache import LruCache
|
|
|
|
|
|
from ._base import BaseSlavedStore
|
|
|
|
|
@@ -24,9 +24,9 @@ class SlavedClientIpStore(BaseSlavedStore):
|
|
|
def __init__(self, database: DatabasePool, db_conn, hs):
|
|
|
super().__init__(database, db_conn, hs)
|
|
|
|
|
|
- self.client_ip_last_seen = DeferredCache(
|
|
|
- name="client_ip_last_seen", keylen=4, max_entries=50000
|
|
|
- ) # type: DeferredCache[tuple, int]
|
|
|
+ self.client_ip_last_seen = LruCache(
|
|
|
+ cache_name="client_ip_last_seen", keylen=4, max_size=50000
|
|
|
+ ) # type: LruCache[tuple, int]
|
|
|
|
|
|
async def insert_client_ip(self, user_id, access_token, ip, user_agent, device_id):
|
|
|
now = int(self._clock.time_msec())
|
|
@@ -41,7 +41,7 @@ class SlavedClientIpStore(BaseSlavedStore):
|
|
|
if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY:
|
|
|
return
|
|
|
|
|
|
- self.client_ip_last_seen.prefill(key, now)
|
|
|
+ self.client_ip_last_seen.set(key, now)
|
|
|
|
|
|
self.hs.get_tcp_replication().send_user_ip(
|
|
|
user_id, access_token, ip, user_agent, device_id, now
|