Skip to content
Snippets Groups Projects
Unverified Commit 1f85c2c0 authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

Merge pull request #4818 from matrix-org/erikj/prefill_client_ips

Prefill client IPs cache on workers
parents 0a6e7166 366877c5
No related branches found
No related tags found
No related merge requests found
Fix bug where we didn't correctly throttle sending of USER_IP commands over replication.
...@@ -43,6 +43,8 @@ class SlavedClientIpStore(BaseSlavedStore): ...@@ -43,6 +43,8 @@ class SlavedClientIpStore(BaseSlavedStore):
if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY: if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY:
return return
self.client_ip_last_seen.prefill(key, now)
self.hs.get_tcp_replication().send_user_ip( self.hs.get_tcp_replication().send_user_ip(
user_id, access_token, ip, user_agent, device_id, now user_id, access_token, ip, user_agent, device_id, now
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment