diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-03-23 00:17:46 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-03-23 00:17:46 +0000 |
| commit | 19b9366d73585e815e59e7a6d07d6e307af5e0fb (patch) | |
| tree | f31d28d9d9de7eb218037277624463cd5e9d08ed /synapse/api | |
| parent | Merge pull request #2044 from matrix-org/rav/crypto_docs (diff) | |
| download | synapse-19b9366d73585e815e59e7a6d07d6e307af5e0fb.tar.xz | |
Fix a couple of logcontext leaks
Use preserve_fn to correctly manage the logcontexts around things we don't want to yield on.
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/auth.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 03a215ab1b..9dbc7993df 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -23,7 +23,7 @@ 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.logcontext import preserve_context_over_fn +from synapse.util import logcontext from synapse.util.metrics import Measure logger = logging.getLogger(__name__) @@ -209,8 +209,7 @@ class Auth(object): default=[""] )[0] if user and access_token and ip_addr: - preserve_context_over_fn( - self.store.insert_client_ip, + logcontext.preserve_fn(self.store.insert_client_ip)( user=user, access_token=access_token, ip=ip_addr, |