Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in util.metrics.Measure

This commit is contained in:
Erik Johnston 2016-02-09 10:16:50 +00:00
parent 97294ef2fd
commit 241b71852e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/util/metrics.py
View File

@ -63,6 +63,8 @@ class Measure(object):
self.new_context.__enter__() self.new_context.__enter__()
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) self.new_context.__exit__(exc_type, exc_val, exc_tb)
if exc_type is not None: if exc_type is not None:
return return
@ -72,7 +74,7 @@ class Measure(object):
context = self.new_context context = self.new_context
if context != self.start_context: if context != current_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