summary refs log tree commit diff
path: root/synapse/util/logcontext.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-24 09:16:20 +0100
committerErik Johnston <erik@matrix.org>2017-10-24 09:16:20 +0100
commit39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch)
tree8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/util/logcontext.py
parentCorrectly wire in update group profile over federation (diff)
parentMerge pull request #2568 from matrix-org/rav/pep8 (diff)
downloadsynapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
Diffstat (limited to 'synapse/util/logcontext.py')
-rw-r--r--synapse/util/logcontext.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py

index 990216145e..9683cc7265 100644 --- a/synapse/util/logcontext.py +++ b/synapse/util/logcontext.py
@@ -42,7 +42,7 @@ try: def get_thread_resource_usage(): return resource.getrusage(RUSAGE_THREAD) -except: +except Exception: # If the system doesn't support resource.getrusage(RUSAGE_THREAD) then we # won't track resource usage by returning None. def get_thread_resource_usage():