Merge pull request #4486 from xperimental/workaround-4216

Implement workaround for login error.
matrix-org · Jan 30, 2019 · 457fbfa · 457fbfa
2 parents 47d03a7 + 2a7f0b8
commit 457fbfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog.d/4486.bugfix b/changelog.d/4486.bugfix
@@ -0,0 +1 @@
+Workaround for login error when using both LDAP and internal authentication.
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py
@@ -285,7 +285,10 @@ def __exit__(self, type, value, traceback):
         self.alive = False
 
         # if we have a parent, pass our CPU usage stats on
-        if self.parent_context is not None:
+        if (
+            self.parent_context is not None
+            and hasattr(self.parent_context, '_resource_usage')
+        ):
             self.parent_context._resource_usage += self._resource_usage
 
             # reset them in case we get entered again
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Workaround for login error when using both LDAP and internal authentication.