diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-24 15:02:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-24 15:02:25 +0100 |
| commit | f009df23ec711e943d958bb0a0e3185d42d7cc79 (patch) | |
| tree | 30fa4558fe72f9429b0d533d12653dc786ad9692 /synapse/util/logcontext.py | |
| parent | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-f009df23ec711e943d958bb0a0e3185d42d7cc79.tar.xz | |
Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1
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(): |