Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1

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():