diff options
| author | Robert Jacob <xperimental@solidproject.de> | 2019-01-27 18:00:27 +0100 |
|---|---|---|
| committer | Robert Jacob <xperimental@solidproject.de> | 2019-01-30 01:06:39 +0100 |
| commit | 2a7f0b8953516dd142d6b4dea04c9e4203fa688d (patch) | |
| tree | 1a6f2764658c3833246ad9ee834c6c7bc3b45ff6 | |
| parent | Merge pull request #4470 from matrix-org/erikj/require_format_version (diff) | |
| download | synapse-2a7f0b8953516dd142d6b4dea04c9e4203fa688d.tar.xz | |
Implement workaround for login error.
Signed-off-by: Robert Jacob <xperimental@solidproject.de>
| -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 |