summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-06-27 13:37:04 +0100
committerErik Johnston <erik@matrix.org>2017-06-27 13:37:04 +0100
commited3d0170d9317644004b1203ecedaba58866ab9d (patch)
treef1011cd5b43ce0bd8b50f98f3ba53c69c7cd9740 /synapse/api
parentMerge pull request #2304 from matrix-org/erikj/users_share_fix (diff)
downloadsynapse-ed3d0170d9317644004b1203ecedaba58866ab9d.tar.xz
Batch upsert user ips
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 0c297cb022..10f4972369 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -23,7 +23,6 @@ from synapse import event_auth
 from synapse.api.constants import EventTypes, Membership, JoinRules
 from synapse.api.errors import AuthError, Codes
 from synapse.types import UserID
-from synapse.util import logcontext
 from synapse.util.metrics import Measure
 
 logger = logging.getLogger(__name__)
@@ -200,7 +199,7 @@ class Auth(object):
                 default=[""]
             )[0]
             if user and access_token and ip_addr:
-                logcontext.preserve_fn(self.store.insert_client_ip)(
+                self.store.insert_client_ip(
                     user=user,
                     access_token=access_token,
                     ip=ip_addr,