tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Don't create new logging context

Browse source
This commit is contained in:
Erik Johnston 2016-02-09 11:06:19 +00:00
parent 241b71852e
commit 9daa4e2a85
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
synapse/util/metrics.py
View file

@ -48,33 +48,34 @@ block_db_txn_duration = metrics.register_distribution(
class Measure(object): class Measure(object):
__slots__ = ["clock", "name", "start_context", "start", "new_context"] __slots__ = [
"clock", "name", "start_context", "start", "new_context", "ru_utime",
"ru_stime", "db_txn_count", "db_txn_duration"
]
def __init__(self, clock, name): def __init__(self, clock, name):
self.clock = clock self.clock = clock
self.name = name self.name = name
self.start_context = None self.start_context = None
self.start = None self.start = None
self.new_context = LoggingContext(self.name)
def __enter__(self): def __enter__(self):
self.start = self.clock.time_msec() self.start = self.clock.time_msec()
self.start_context = LoggingContext.current_context() self.start_context = LoggingContext.current_context()
self.new_context.__enter__() self.ru_utime, self.ru_stime = self.start_context.get_resource_usage()
self.db_txn_count = self.start_context.db_txn_count
self.db_txn_duration = self.start_context.db_txn_duration
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
current_context = LoggingContext.current_context()
self.new_context.__exit__(exc_type, exc_val, exc_tb)
if exc_type is not None: if exc_type is not None:
return return
duration = self.clock.time_msec() - self.start duration = self.clock.time_msec() - self.start
block_timer.inc_by(duration, self.name) block_timer.inc_by(duration, self.name)
context = self.new_context context = LoggingContext.current_context()
if context != current_context: if context != self.start_context:
logger.warn( logger.warn(
"Context have unexpectedly changed from '%s' to '%s'. (%r)", "Context have unexpectedly changed from '%s' to '%s'. (%r)",
context, self.start_context, self.name context, self.start_context, self.name
@ -87,7 +88,9 @@ class Measure(object):
ru_utime, ru_stime = context.get_resource_usage() ru_utime, ru_stime = context.get_resource_usage()
block_ru_utime.inc_by(ru_utime, self.name) block_ru_utime.inc_by(ru_utime - self.ru_utime, self.name)
block_ru_stime.inc_by(ru_stime, self.name) block_ru_stime.inc_by(ru_stime - self.ru_stime, self.name)
block_db_txn_count.inc_by(context.db_txn_count, self.name) block_db_txn_count.inc_by(context.db_txn_count - self.db_txn_count, self.name)
block_db_txn_duration.inc_by(context.db_txn_duration, self.name) block_db_txn_duration.inc_by(
context.db_txn_duration - self.db_txn_duration, self.name
)