This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Fix make_deferred_yieldable to work with coroutines
#6505
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
richvdh
approved these changes
Dec 10, 2019
synapse/logging/context.py
Outdated
| @@ -624,6 +626,11 @@ def make_deferred_yieldable(deferred): | |||
|
|
|||
| (This is more-or-less the opposite operation to run_in_background.) | |||
| """ | |||
| if inspect.isawaitable(deferred): | |||
| # If we're given a coroutine we need to convert it to a deferred so that | |||
| # we can attach callbacks (and not immediately return). | |||
There was a problem hiding this comment.
I'm not convinced that's the reason we need to convert it to a deferred (we can do similar things by awaiting awaitables).
What it does do is to start running the coroutine and find out if it has finished or not, which saves us clearing and immediately restoring the logcontext in the common case that the coroutine completes synchronously.
There was a problem hiding this comment.
Hmm, fair. I guess I was thinking of this in terms of converting to a future/deferred so that we could put the callbacks on it (since you can't do that on raw coroutines). Will reword
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit '35f3c366e': Update comment Newsfile Fix make_deferred_yieldable to work with coroutines
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.