Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:06:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix a couple of logcontext leaks

Browse source 
Use preserve_fn to correctly manage the logcontexts around things we don't want
to yield on.
This commit is contained in:
Richard van der Hoff 2017-03-23 00:17:46 +00:00
parent 35e0cfb54d
commit 19b9366d73
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/api/auth.py
View file

@ -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,