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/logging/_structured.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/logging/_structured.py')
| -rw-r--r-- | synapse/logging/_structured.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/logging/_structured.py b/synapse/logging/_structured.py index ffa7b20ca8..7372450b45 100644 --- a/synapse/logging/_structured.py +++ b/synapse/logging/_structured.py @@ -42,7 +42,7 @@ from synapse.logging._terse_json import ( TerseJSONToConsoleLogObserver, TerseJSONToTCPLogObserver, ) -from synapse.logging.context import LoggingContext +from synapse.logging.context import current_context def stdlib_log_level_to_twisted(level: str) -> LogLevel: @@ -86,7 +86,7 @@ class LogContextObserver(object): ].startswith("Timing out client"): return - context = LoggingContext.current_context() + context = current_context() # Copy the context information to the log event. if context is not None: |