diff options
| author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
| commit | b37e8c9572ef90367bef9e70b66150fdfe243e5d (patch) | |
| tree | 1207a22a9529d48603317826926bc02866a474a0 /synapse/util/logcontext.py | |
| parent | isort (diff) | |
| parent | Merge branch 'develop' into neilj/room_capabilities (diff) | |
| download | synapse-b37e8c9572ef90367bef9e70b66150fdfe243e5d.tar.xz | |
Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into neilj/room_capabilities
Diffstat (limited to 'synapse/util/logcontext.py')
| -rw-r--r-- | synapse/util/logcontext.py | 5 |
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 |