[Backport release-1.29] Don't use the wrong PID in error strings #4596
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
Instead of using the PID in the argument, the error strings were constructed using the PID of the currently running process. This would have caused a panic because the PID file cleanup is called before the supervised process is started. So the s.cmd would have been nil. Don't put the PID in the errors at this level at all, but wrap the error once with the actual PID read from the PID file in maybeKillPidFile. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit eb0839f) (cherry picked from commit f76bc8d)
twz123
added
bug
jnummelin
approved these changes
Jun 12, 2024
|
Successfully created backport PR for |
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.
Backport to
release-1.29:See: