mirror of
https://mau.dev/maunium/synapse.git
synced 2024-07-18 09:02:07 +00:00
Merge pull request #4486 from xperimental/workaround-4216
Implement workaround for login error.
This commit is contained in:
commit
457fbfaf22
1
changelog.d/4486.bugfix
Normal file
1
changelog.d/4486.bugfix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Workaround for login error when using both LDAP and internal authentication.
|
|
@ -285,7 +285,10 @@ class LoggingContext(object):
|
||||||
self.alive = False
|
self.alive = False
|
||||||
|
|
||||||
# if we have a parent, pass our CPU usage stats on
|
# 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
|
self.parent_context._resource_usage += self._resource_usage
|
||||||
|
|
||||||
# reset them in case we get entered again
|
# reset them in case we get entered again
|
||||||
|
|
Loading…
Reference in New Issue
Block a user