Conversation
…eration management
Refactor tray shutdown to use a single tokio::sync::watch channel for unified async signaling between the tray and Ctrl+C handler. Remove all polling, atomic flags, and boxed closures for shutdown. Tray and CLI shutdown now both trigger the same event-driven cleanup path. Retain mpsc for operation thread signaling, keeping thread code simple and idiomatic. No sleeping or spin loops; all shutdown is event-driven and efficient. Improves maintainability, clarity, and Rust idiomaticity for hybrid async/threaded code.
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request replaces the blocking shutdown mechanism (using std::thread::park()) with an idiomatic async shutdown implementation using tokio watch channels and signal handling. The changes enable graceful shutdown of the system tray application through either Ctrl+C or the Exit menu button.
Changes:
- Introduced tokio watch channels for shutdown signaling between the tray and the async runtime
- Added async Ctrl+C signal handling with graceful shutdown
- Replaced blocking
std::thread::park()withtokio::select!to wait for shutdown events - Enhanced cleanup flow with explicit operation stopping and tray shutdown
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/tray/mod.rs | Implements async shutdown with tokio::select!, watches for Exit button or Ctrl+C, and performs graceful cleanup |
| src/tray/app.rs | Adds shutdown signaling via watch channel, changes new() to return receiver, adds shutdown() method, and implements Drop for safety |
| Cargo.toml | Adds tokio "signal" feature for Ctrl+C handling |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
- Move shutdown and cleanup actions directly into the `tokio::select!` arms for clarity and simplicity. - Each shutdown path (Exit button or Ctrl+C) is now handled in-place, making the code easier to read and maintain. - No redundant cleanup; shutdown logic is linear and idiomatic.
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.
No description provided.