summary refs log tree commit diff
path: root/synapse/logging/scopecontextmanager.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-27 16:20:24 +0100
committerGitHub <noreply@github.com>2020-07-27 16:20:24 +0100
commit1ef9efc1e07d3b7339249a79cd379105f1f335ea (patch)
treeef6771046dae4240534d0416b36b63bea43504b4 /synapse/logging/scopecontextmanager.py
parentFix typing replication not being handled on master (#7959) (diff)
downloadsynapse-1ef9efc1e07d3b7339249a79cd379105f1f335ea.tar.xz
Fix error reporting when using `opentracing.trace` (#7961)
Diffstat (limited to 'synapse/logging/scopecontextmanager.py')
-rw-r--r--synapse/logging/scopecontextmanager.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/logging/scopecontextmanager.py b/synapse/logging/scopecontextmanager.py

index dc3ab00cbb..026854b4c7 100644 --- a/synapse/logging/scopecontextmanager.py +++ b/synapse/logging/scopecontextmanager.py
@@ -116,6 +116,8 @@ class _LogContextScope(Scope): if self._enter_logcontext: self.logcontext.__enter__() + return self + def __exit__(self, type, value, traceback): if type == twisted.internet.defer._DefGen_Return: super(_LogContextScope, self).__exit__(None, None, None)