1
0

Merge pull request #4486 from xperimental/workaround-4216

Implement workaround for login error.
This commit is contained in:
Richard van der Hoff
2019-01-30 07:06:11 +00:00
committed by GitHub
2 changed files with 5 additions and 1 deletions
+1
View File
@@ -0,0 +1 @@
Workaround for login error when using both LDAP and internal authentication.
+4 -1
View File
@@ -285,7 +285,10 @@ class LoggingContext(object):
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