fix: run xs.stopping shutdown protocol on SIGTERM, not just SIGINT - #53
Merged
Conversation
cablehead
added a commit
to cablehead/pai-sho
that referenced
this pull request
Aug 6, 2026
The daemon raced only ctrl_c before; nothing ran on SIGTERM, which is what launchd/brew services/systemd/pkill send. Race the CLI socket loop against a shutdown_signal() that selects SIGINT and SIGTERM, so a supervisor stops the daemon cleanly and the TUN fd closes on exit (the kernel then removes the utun and its route). Modeled on cablehead/xs#150 and cablehead/http-nu#53.
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
1 participant
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.
Store::initspawned the service processor withtokio::spawnbut dropped itsJoinHandle, so nothing ever appendedxs.stoppingon shutdown, leaving child processes spawned by.servicescripts running after SIGTERM or ctrl-c.What changed
Storenow keeps the service processor'sJoinHandle.serve()returns,Store::shutdownappendsxs.stoppingand awaits that handle, bounded by a 3s timeout so a stuck processor can't hang exit.Notes for reviewers
^sleep 300, sent SIGTERM to a--store --servicesserver, and confirmed the sleep child was reaped (not reparented to pid 1) and the store recordedxs.stoppingfollowed byxs.service.<name>.stopped.cargo testpasses except two pre-existing TLS tests (test_http2_tls_support,test_server_tls_socket) that fail on main too, becausetests/combined.pemhas expired.