Skip to content
Snippets Groups Projects
Unverified Commit 457fbfaf authored by Richard van der Hoff's avatar Richard van der Hoff Committed by GitHub
Browse files

Merge pull request #4486 from xperimental/workaround-4216

Implement workaround for login error.
parents 47d03a79 2a7f0b89
No related branches found
No related tags found
No related merge requests found
Workaround for login error when using both LDAP and internal authentication.
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment