diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-03-24 14:45:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-24 14:45:33 +0000 |
| commit | 39230d217104f3cd7aba9065dc478f935ce1e614 (patch) | |
| tree | 3585baa74ba9dfeba89efc367a5ec79f02b847d3 /synapse/util/metrics.py | |
| parent | Fix CAS redirect url (#6634) (diff) | |
| download | synapse-39230d217104f3cd7aba9065dc478f935ce1e614.tar.xz | |
Clean up some LoggingContext stuff (#7120)
* Pull Sentinel out of LoggingContext ... and drop a few unnecessary references to it * Factor out LoggingContext.current_context move `current_context` and `set_context` out to top-level functions. Mostly this means that I can more easily trace what's actually referring to LoggingContext, but I think it's generally neater. * move copy-to-parent into `stop` this really just makes `start` and `stop` more symetric. It also means that it behaves correctly if you manually `set_log_context` rather than using the context manager. * Replace `LoggingContext.alive` with `finished` Turn `alive` into `finished` and make it a bit better defined.
Diffstat (limited to 'synapse/util/metrics.py')
| -rw-r--r-- | synapse/util/metrics.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/metrics.py b/synapse/util/metrics.py index 7b18455469..ec61e14423 100644 --- a/synapse/util/metrics.py +++ b/synapse/util/metrics.py @@ -21,7 +21,7 @@ from prometheus_client import Counter from twisted.internet import defer -from synapse.logging.context import LoggingContext +from synapse.logging.context import LoggingContext, current_context from synapse.metrics import InFlightGauge logger = logging.getLogger(__name__) @@ -106,7 +106,7 @@ class Measure(object): raise RuntimeError("Measure() objects cannot be re-used") self.start = self.clock.time() - parent_context = LoggingContext.current_context() + parent_context = current_context() self._logging_context = LoggingContext( "Measure[%s]" % (self.name,), parent_context ) |