Merge branch 'release-v1.18.0' into matrix-org-hotfixes

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)