diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-11 09:34:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 09:34:12 +0100 |
| commit | 5202679edc29afe96f8c9ac3addff0b0a8bcfaac (patch) | |
| tree | cde98e790b3db1a48036b65e971d95758cad847a /synapse/util | |
| parent | Merge pull request #999 from matrix-org/erikj/measure_more (diff) | |
| parent | PEP8 (diff) | |
| download | synapse-5202679edc29afe96f8c9ac3addff0b0a8bcfaac.tar.xz | |
Merge pull request #1000 from matrix-org/erikj/contexts
Clean up TransactionQueue
Diffstat (limited to '')
| -rw-r--r-- | synapse/util/logcontext.py | 1 | ||||
| -rw-r--r-- | synapse/util/metrics.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py index 5316259d15..7a87045f87 100644 --- a/synapse/util/logcontext.py +++ b/synapse/util/logcontext.py @@ -317,7 +317,6 @@ def preserve_fn(f): def g(*args, **kwargs): with PreserveLoggingContext(current): return f(*args, **kwargs) - return g diff --git a/synapse/util/metrics.py b/synapse/util/metrics.py index 4d7fee8868..76f301f549 100644 --- a/synapse/util/metrics.py +++ b/synapse/util/metrics.py @@ -78,7 +78,6 @@ class Measure(object): self.start = self.clock.time_msec() self.start_context = LoggingContext.current_context() if not self.start_context: - logger.warn("Entered Measure without log context: %s", self.name) self.start_context = LoggingContext("Measure") self.start_context.__enter__() self.created_context = True @@ -99,7 +98,7 @@ class Measure(object): if context != self.start_context: logger.warn( "Context has unexpectedly changed from '%s' to '%s'. (%r)", - context, self.start_context, self.name + self.start_context, context, self.name ) return |