summary refs log tree commit diff
path: root/synapse/logging/context.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 18:14:38 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 18:14:38 +0100
commit3d08c7e63bfd1c8d40ebf6133d2d181c6f1098a9 (patch)
tree22e0ad4049a830de22c998846f9c75a6ec5841b5 /synapse/logging/context.py
parentMerge commit 'c73cc2c2a' into anoa/dinsic_release_1_31_0 (diff)
parentplatform specific prerequisites in source install (#9667) (diff)
downloadsynapse-3d08c7e63bfd1c8d40ebf6133d2d181c6f1098a9.tar.xz
Merge commit 'e5801db83' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/logging/context.py')
-rw-r--r--synapse/logging/context.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/logging/context.py b/synapse/logging/context.py

index 1a7ea4fa96..03cf3c2b8e 100644 --- a/synapse/logging/context.py +++ b/synapse/logging/context.py
@@ -689,7 +689,7 @@ def run_in_background(f, *args, **kwargs) -> defer.Deferred: current = current_context() try: res = f(*args, **kwargs) - except: # noqa: E722 + except Exception: # the assumption here is that the caller doesn't want to be disturbed # by synchronous exceptions, so let's turn them into Failures. return defer.fail()