summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-06-27 15:08:32 +0100
committerGitHub <noreply@github.com>2017-06-27 15:08:32 +0100
commit816605a1376c9686557edf08c24280950214184f (patch)
treef5c3a1983ab0a0c803218d5eada73299ecae316c /synapse/api/auth.py
parentMerge pull request #2290 from matrix-org/erikj/ensure_round_trip (diff)
parentFix up client ips to read from pending data (diff)
downloadsynapse-816605a1376c9686557edf08c24280950214184f.tar.xz
Merge pull request #2307 from matrix-org/erikj/user_ip_batch
Batch upsert user ips
Diffstat (limited to 'synapse/api/auth.py')
-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,