summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-06-27 15:53:45 +0100
committerErik Johnston <erik@matrix.org>2017-06-27 15:53:45 +0100
commit8c23221666f1a09fdc97c2b526cb100cdbd32f60 (patch)
tree89cb4b139527f59388026987204e66b878bab931 /synapse/replication
parentMake workers report to master for user ip updates (diff)
downloadsynapse-8c23221666f1a09fdc97c2b526cb100cdbd32f60.tar.xz
Fix up
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/slave/storage/client_ips.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/replication/slave/storage/client_ips.py b/synapse/replication/slave/storage/client_ips.py
index 65250285e8..352c9a2aa8 100644
--- a/synapse/replication/slave/storage/client_ips.py
+++ b/synapse/replication/slave/storage/client_ips.py
@@ -29,9 +29,8 @@ class SlavedClientIpStore(BaseSlavedStore):
             max_entries=50000 * CACHE_SIZE_FACTOR,
         )
 
-    def insert_client_ip(self, user, access_token, ip, user_agent, device_id):
+    def insert_client_ip(self, user_id, access_token, ip, user_agent, device_id):
         now = int(self._clock.time_msec())
-        user_id = user.to_string()
         key = (user_id, access_token, ip)
 
         try: