summary refs log tree commit diff
path: root/synapse/util/logcontext.py
diff options
context:
space:
mode:
authorRobert Jacob <xperimental@solidproject.de>2019-01-27 18:00:27 +0100
committerRobert Jacob <xperimental@solidproject.de>2019-01-30 01:06:39 +0100
commit2a7f0b8953516dd142d6b4dea04c9e4203fa688d (patch)
tree1a6f2764658c3833246ad9ee834c6c7bc3b45ff6 /synapse/util/logcontext.py
parentMerge pull request #4470 from matrix-org/erikj/require_format_version (diff)
downloadsynapse-2a7f0b8953516dd142d6b4dea04c9e4203fa688d.tar.xz
Implement workaround for login error.
Signed-off-by: Robert Jacob <xperimental@solidproject.de>
Diffstat (limited to 'synapse/util/logcontext.py')
-rw-r--r--synapse/util/logcontext.py5
1 files changed, 4 insertions, 1 deletions
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