Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-27 04:59:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set parent context on instansiation

Browse Source
This commit is contained in:
Erik Johnston 2016-02-10 11:23:32 +00:00
parent e664e9737c
commit 9777c5f49a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/util/logcontext.py
View File

@ -79,7 +79,7 @@ class LoggingContext(object):
sentinel = Sentinel() sentinel = Sentinel()
def __init__(self, name=None): def __init__(self, name=None):
self.parent_context = None self.parent_context = LoggingContext.current_context()
self.name = name self.name = name
self.ru_stime = 0. self.ru_stime = 0.
self.ru_utime = 0. self.ru_utime = 0.
@ -116,7 +116,12 @@ class LoggingContext(object):
def __enter__(self): def __enter__(self):
"""Enters this logging context into thread local storage""" """Enters this logging context into thread local storage"""
self.parent_context = self.set_current_context(self) old_context = self.set_current_context(self)
if self.parent_context != old_context:
logger.warn(
"Expected parent context %r, found %r",
self.parent_context, old_context
)
self.alive = True self.alive = True
return self return self