diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-06-07 17:57:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 17:57:49 +0100 |
| commit | b2557cbf42d39fbd8a497a2f859cb45f84539da9 (patch) | |
| tree | 1319ad53cd6c90c346c4ce9083486d7123e61f2a /synapse/logging/opentracing.py | |
| parent | Make link in docs use HTTPS (#10130) (diff) | |
| download | synapse-b2557cbf42d39fbd8a497a2f859cb45f84539da9.tar.xz | |
opentracing: use a consistent name for background processes (#10135)
... otherwise we tend to get a namespace clash between the bg process and the functions that it calls.
Diffstat (limited to 'synapse/logging/opentracing.py')
| -rw-r--r-- | synapse/logging/opentracing.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py index 26c8ffe780..dd9377340e 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py @@ -337,6 +337,7 @@ def ensure_active_span(message, ret=None): @contextlib.contextmanager def noop_context_manager(*args, **kwargs): """Does exactly what it says on the tin""" + # TODO: replace with contextlib.nullcontext once we drop support for Python 3.6 yield |