diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-01-30 07:06:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 07:06:11 +0000 |
| commit | 457fbfaf2213e6b63b8eaad3bf47fd1037679f31 (patch) | |
| tree | 2b336b236577d1d2b968b067dd320e5f2d6e83a0 | |
| parent | Merge pull request #4515 from matrix-org/erikj/room_version_v3 (diff) | |
| parent | Implement workaround for login error. (diff) | |
| download | synapse-457fbfaf2213e6b63b8eaad3bf47fd1037679f31.tar.xz | |
Merge pull request #4486 from xperimental/workaround-4216
Implement workaround for login error.
| -rw-r--r-- | changelog.d/4486.bugfix | 1 | ||||
| -rw-r--r-- | synapse/util/logcontext.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelog.d/4486.bugfix b/changelog.d/4486.bugfix new file mode 100644 index 0000000000..64588d509b --- /dev/null +++ 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 index 4c6e92beb8..311b49e18a 100644 --- a/synapse/util/logcontext.py +++ b/synapse/util/logcontext.py @@ -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 |