1
0

Fix logcontext spam on non-Linux platforms

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
This commit is contained in:
J. Ryan Stinnett
2019-09-18 18:00:49 +01:00
parent 63f9317b8e
commit 5d4d1ad77e
2 changed files with 12 additions and 2 deletions
+1
View File
@@ -0,0 +1 @@
Fix logcontext spam on non-Linux platforms.
+11 -2
View File
@@ -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,19 @@ try:
# exception.
resource.getrusage(RUSAGE_THREAD)
def is_thread_resource_usage_supported():
return 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.
def is_thread_resource_usage_supported():
return False
def get_thread_resource_usage():
return None
@@ -359,7 +366,9 @@ 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()