tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #3144 from matrix-org/rav/run_in_background_exception_handling

Browse source 
Trap exceptions thrown within run_in_background
This commit is contained in:
Richard van der Hoff 2018-04-30 10:23:02 +01:00 committed by GitHub
commit fdb6849b81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
synapse/util/logcontext.py
View file

@ -313,7 +313,13 @@ def run_in_background(f, *args, **kwargs):
indication about where it came from. indication about where it came from.
""" """
current = LoggingContext.current_context() current = LoggingContext.current_context()
res = f(*args, **kwargs) try:
res = f(*args, **kwargs)
except: # noqa: E722
# 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()
if isinstance(res, defer.Deferred) and not res.called: if isinstance(res, defer.Deferred) and not res.called:
# The function will have reset the context before returning, so # The function will have reset the context before returning, so
# we need to restore it now. # we need to restore it now.