summary refs log tree commit diff
path: root/synapse/logging/context.py
diff options
context:
space:
mode:
authorJ. Ryan Stinnett <jryans@gmail.com>2019-09-18 21:55:37 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-09-18 21:55:37 +0100
commita86a290850dad40c1ac38c4e20b2da039f246922 (patch)
treedccb077b0149af883403f3e80acc422ef563dfc3 /synapse/logging/context.py
parentfix sample config (diff)
downloadsynapse-a86a290850dad40c1ac38c4e20b2da039f246922.tar.xz
Fix logcontext spam on non-Linux platforms (#6059)
This checks whether the current platform supports thread resource usage tracking
before logging a warning to avoid log spam.

Fixes https://github.com/matrix-org/synapse/issues/6055
Diffstat (limited to 'synapse/logging/context.py')
-rw-r--r--synapse/logging/context.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/synapse/logging/context.py b/synapse/logging/context.py

index 63379bfb93..370000e377 100644 --- a/synapse/logging/context.py +++ b/synapse/logging/context.py
@@ -1,4 +1,5 @@ # Copyright 2014-2016 OpenMarket Ltd +# Copyright 2019 The Matrix.org Foundation C.I.C. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -42,13 +43,17 @@ try: # exception. resource.getrusage(RUSAGE_THREAD) + is_thread_resource_usage_supported = True + def get_thread_resource_usage(): return resource.getrusage(RUSAGE_THREAD) except Exception: # If the system doesn't support resource.getrusage(RUSAGE_THREAD) then we - # won't track resource usage by returning None. + # won't track resource usage. + is_thread_resource_usage_supported = False + def get_thread_resource_usage(): return None @@ -359,7 +364,11 @@ class LoggingContext(object): # When we stop, let's record the cpu used since we started if not self.usage_start: - logger.warning("Called stop on logcontext %s without calling start", self) + # Log a warning on platforms that support thread usage tracking + if is_thread_resource_usage_supported: + logger.warning( + "Called stop on logcontext %s without calling start", self + ) return utime_delta, stime_delta = self._get_cputime()