fix(cli): complete launchd restart after self-restart signal#36240
Open
konsisumer wants to merge 1 commit into
Open
fix(cli): complete launchd restart after self-restart signal#36240konsisumer wants to merge 1 commit into
konsisumer wants to merge 1 commit into
Conversation
Collaborator
Contributor
Author
|
Thanks @alt-glitch — I looked at #35178. Both PRs touch
Should I: Happy to consolidate if that's the preference — just need guidance on which approach to take. Note: the CI failure in |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What does this PR do?
Fixes a macOS gateway restart regression where
launchd_restart()returned immediately after sending SIGUSR1 when the gateway PID was an ancestor of the caller (for example whenhermes updateran inside the gateway process tree). This change removes the early-exit behavior for that path so restart consistently completes with a launchd kickstart.Related Issue
Fixes #11932
Type of Change
Changes Made
hermes_cli/gateway.py: inlaunchd_restart(), replaced the SIGUSR1 self-restart early return with drain wait (_wait_for_gateway_exit) and then continued tolaunchctl kickstart -klike the other restart path.tests/hermes_cli/test_gateway_service.py: updated self-restart test to assert SIGUSR1 request, drain wait call with configured timeout, andlaunchctl kickstart -kexecution.How to Test
pytest tests/hermes_cli/test_gateway_service.py -q -k launchd_restartpython scripts/check-windows-footguns.py hermes_cli/gateway.py tests/hermes_cli/test_gateway_service.pyruff check hermes_cli/gateway.py tests/hermes_cli/test_gateway_service.pyWhat platforms tested on
Checklist
Code
fix(scope):,feat(scope):, etc.)pytest tests/ -qand all tests passDocumentation & Housekeeping
docs/, docstrings) — or N/Acli-config.yaml.exampleif I added/changed config keys — or N/ACONTRIBUTING.mdorAGENTS.mdif I changed architecture or workflows — or N/A