diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2021-10-04 14:17:05 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2021-10-04 14:17:05 +0100 |
| commit | ebbd37b66db2c5ed700d50dd00e3e108d7f1268c (patch) | |
| tree | 235bd75367c221a98d10c03eb86d63173e875bb2 /synapse/storage | |
| parent | Merge branch 'release-v1.44' into matrix-org-hotfixes (diff) | |
| parent | Fix error in `get_user_ip_and_agents` when fetching from the database (#10968) (diff) | |
| download | synapse-ebbd37b66db2c5ed700d50dd00e3e108d7f1268c.tar.xz | |
Merge branch 'release-v1.44' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/databases/main/client_ips.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/client_ips.py b/synapse/storage/databases/main/client_ips.py index dafba2b03f..5f611d7b09 100644 --- a/synapse/storage/databases/main/client_ips.py +++ b/synapse/storage/databases/main/client_ips.py @@ -591,8 +591,8 @@ class ClientIpStore(ClientIpWorkerStore): ) results.update( - ((row["access_token"], row["ip"]), (row["user_agent"], row["last_seen"])) - for row in rows + ((access_token, ip), (user_agent, last_seen)) + for access_token, ip, user_agent, last_seen in rows ) return [ { |