[Messenger] Fix graceful exit #52080
Merged
Conversation
This file contains hidden or 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
HypeMC
commented
Oct 16, 2023
| return 0; | ||
| return false; |
There was a problem hiding this comment.
There's no need to exit here, we just have to call $this->worker->stop() and the command will finish gracefully once the handler is done.
HypeMC
commented
Oct 16, 2023
Comment on lines
-201
to
+213
| $shouldHandle = $shouldForce || 'retry' === $io->choice('Please select an action', ['retry', 'delete'], 'retry'); | ||
| $this->forceExit = true; | ||
| try { | ||
| $shouldHandle = $shouldForce || 'retry' === $io->choice('Please select an action', ['retry', 'delete'], 'retry'); | ||
| } finally { | ||
| $this->forceExit = false; | ||
| } |
There was a problem hiding this comment.
With the messenger:failed:retry it's a little different, the $io->choice() method has an infinitive loop, so we need to exit if the command is waiting for an answer, otherwise we're stuck in the loop, which is the original issue that I tried to fix in #50787.
HypeMC
commented
Oct 16, 2023
Comment on lines
+162
to
+164
| if ($this->shouldStop) { | ||
| break; | ||
| } |
There was a problem hiding this comment.
This is required because the worker is instantiated in loops as well.
HypeMC
commented
Oct 16, 2023
| @@ -180,7 +187,7 @@ private function runInteractive(string $failureTransportName, SymfonyStyle $io, | |||
| } | |||
|
|
|||
| // avoid success message if nothing was processed | |||
| if (1 <= $count) { | |||
| if (1 <= $count && !$this->shouldStop) { | |||
There was a problem hiding this comment.
To avoid printing the message if the command has been terminated.
fabpot
approved these changes
Oct 16, 2023
|
Thank you @HypeMC. |
fabpot
added a commit
that referenced
this pull request
Oct 20, 2023
This PR was merged into the 6.3 branch. Discussion ---------- [Messenger] Fix graceful exit with ids | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT One last case I missed in #52080 Commits ------- 1fc56bb [Messenger] Fix graceful exit with ids
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
My previous PR #50787 accidentally broke the behavior of the
messenger:consumecommand. It no longer waits for the handler to finish, instead it exists immediately.