diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-10-23 17:39:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 17:39:31 +0100 |
| commit | 0d437698b2e040eface5094852576c43916c2e0c (patch) | |
| tree | 9090c6c6f5ba5566786b8654cee07b3c3acd97c8 /synapse/util/logcontext.py | |
| parent | Merge pull request #2566 from matrix-org/rav/media_logcontext_leak (diff) | |
| parent | fix vars named `l` (diff) | |
| download | synapse-0d437698b2e040eface5094852576c43916c2e0c.tar.xz | |
Merge pull request #2568 from matrix-org/rav/pep8
PEP8 fixes
Diffstat (limited to 'synapse/util/logcontext.py')
| -rw-r--r-- | synapse/util/logcontext.py | 2 |
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(): |