From 241b71852e549de8a3042f8a7c22ba56af482657 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 9 Feb 2016 10:16:50 +0000
Subject: [PATCH] Fix bug in util.metrics.Measure

---
 synapse/util/metrics.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/synapse/util/metrics.py b/synapse/util/metrics.py
index f70d855122..7c6899aa1c 100644
--- a/synapse/util/metrics.py
+++ b/synapse/util/metrics.py
@@ -63,6 +63,8 @@ class Measure(object):
         self.new_context.__enter__()
 
     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:
             return
@@ -72,7 +74,7 @@ class Measure(object):
 
         context = self.new_context
 
-        if context != self.start_context:
+        if context != current_context:
             logger.warn(
                 "Context have unexpectedly changed from '%s' to '%s'. (%r)",
                 context, self.start_context, self.name