Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-25 21:09:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Test for sentinel commit

Browse Source
This commit is contained in:
Erik Johnston 2019-10-10 10:58:32 +01:00
parent 1d6dd1c294
commit 3e4272961a
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
synapse/util/patch_inline_callbacks.py
View File

@ -146,13 +146,30 @@ def _check_yield_points(f, changes, start_context):
# raise Exception(err) # raise Exception(err)
return getattr(e, "value", None) return getattr(e, "value", None)
frame = gen.gi_frame
if isinstance(d, defer.Deferred):
# This happens if we yield on a deferred that doesn't follow
# the log context rules without wrappin in a `make_deferred_yieldable`
if LoggingContext.current_context() != LoggingContext.Sentinel:
err = (
"%s yielded with context %s rather than Sentinel,"
" yielded on line %d in %s"
% (
frame.f_code.co_name,
start_context,
LoggingContext.current_context(),
frame.f_lineno,
frame.f_code.co_filename,
)
)
changes.append(err)
try: try:
result = yield d result = yield d
except Exception as e: except Exception as e:
result = Failure(e) result = Failure(e)
frame = gen.gi_frame
if LoggingContext.current_context() != expected_context: if LoggingContext.current_context() != expected_context:
# This happens because the context is lost sometime *after* the # This happens because the context is lost sometime *after* the
# previous yield and *after* the current yield. E.g. the # previous yield and *after* the current yield. E.g. the