Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 13:18:45 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'erikj/get_pdu_versions' into erikj/require_format_version

Browse source
This commit is contained in:
Erik Johnston 2019-01-23 17:27:49 +00:00
commit 2a8edbaf74
29 changed files with 933 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/storage/client_ips.py
View file

@ -143,6 +143,11 @@ class ClientIpStore(background_updates.BackgroundUpdateStore):
# If it returns None, then we're processing the last batch
last = end_last_seen is None
logger.info(
"Scanning for duplicate 'user_ips' rows in range: %s <= last_seen < %s",
begin_last_seen, end_last_seen,
)
def remove(txn):
# This works by looking at all entries in the given time span, and
# then for each (user_id, access_token, ip) tuple in that range
@ -170,7 +175,6 @@ class ClientIpStore(background_updates.BackgroundUpdateStore):
SELECT user_id, access_token, ip
FROM user_ips
WHERE {}
ORDER BY last_seen
) c
INNER JOIN user_ips USING (user_id, access_token, ip)
GROUP BY user_id, access_token, ip