Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4486 from xperimental/workaround-4216

Browse Source 
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
commit 457fbfaf22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4486.bugfix Normal file
View File

@ -0,0 +1 @@
Workaround for login error when using both LDAP and internal authentication.

5
synapse/util/logcontext.py
View File

@ -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