-
-
Notifications
You must be signed in to change notification settings - Fork 27
feat: add restart command to CLI #134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <!-- @generated by usage-cli from usage spec --> | ||
| # `pitchfork restart` | ||
|
|
||
| - **Usage**: `pitchfork restart [-a --all] [-q --quiet] [ID]…` | ||
|
|
||
| Restarts a daemon (stops then starts it) | ||
|
|
||
| Sends SIGTERM to stop the daemon, then starts it again from the | ||
| pitchfork.toml configuration. | ||
|
|
||
| Examples: | ||
| pitchfork restart api Restart a single daemon | ||
| pitchfork restart api worker Restart multiple daemons | ||
| pitchfork restart --all Restart all running daemons | ||
|
|
||
| ## Arguments | ||
|
|
||
| ### `[ID]…` | ||
|
|
||
| ID of the daemon(s) to restart | ||
|
|
||
| ## Flags | ||
|
|
||
| ### `-a --all` | ||
|
|
||
| Restart all running daemons | ||
|
|
||
| ### `-q --quiet` | ||
|
|
||
| Suppress startup log output |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,216 @@ | ||
| use crate::Result; | ||
| use crate::cli::logs::print_startup_logs; | ||
| use crate::daemon::RunOptions; | ||
| use crate::ipc::client::IpcClient; | ||
| use crate::pitchfork_toml::PitchforkToml; | ||
| use chrono::{DateTime, Local}; | ||
| use miette::ensure; | ||
| use std::sync::Arc; | ||
|
|
||
| /// Restarts a daemon (stops then starts it) | ||
| #[derive(Debug, clap::Args)] | ||
| #[clap( | ||
| verbatim_doc_comment, | ||
| long_about = "\ | ||
| Restarts a daemon (stops then starts it) | ||
|
|
||
| Sends SIGTERM to stop the daemon, then starts it again from the | ||
| pitchfork.toml configuration. | ||
|
|
||
| Examples: | ||
| pitchfork restart api Restart a single daemon | ||
| pitchfork restart api worker Restart multiple daemons | ||
| pitchfork restart --all Restart all running daemons" | ||
| )] | ||
| pub struct Restart { | ||
| /// ID of the daemon(s) to restart | ||
| id: Vec<String>, | ||
| /// Restart all running daemons | ||
| #[clap(long, short)] | ||
| all: bool, | ||
| /// Suppress startup log output | ||
| #[clap(short, long)] | ||
| quiet: bool, | ||
| } | ||
|
|
||
| impl Restart { | ||
| pub async fn run(&self) -> Result<()> { | ||
| ensure!( | ||
| self.all || !self.id.is_empty(), | ||
| "You must provide at least one daemon to restart, or use --all" | ||
| ); | ||
|
|
||
| let pt = PitchforkToml::all_merged(); | ||
| let ipc = Arc::new(IpcClient::connect(true).await?); | ||
|
|
||
| // Determine which daemons to restart | ||
| let ids: Vec<String> = if self.all { | ||
| // Get all running daemons | ||
| let active = ipc.active_daemons().await?; | ||
| active | ||
| .into_iter() | ||
| .filter(|d| d.pid.is_some()) | ||
| .map(|d| d.id) | ||
| .collect() | ||
| } else { | ||
| self.id.clone() | ||
| }; | ||
|
|
||
| if ids.is_empty() { | ||
| info!("No daemons to restart"); | ||
| return Ok(()); | ||
| } | ||
|
|
||
| // Stop all daemons first | ||
| for id in &ids { | ||
| if let Err(e) = ipc.stop(id.clone()).await { | ||
| warn!("Failed to stop daemon {}: {}", id, e); | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| } | ||
|
|
||
| // Brief delay to allow processes to terminate | ||
| tokio::time::sleep(tokio::time::Duration::from_millis(500)).await; | ||
|
|
||
| // Start all daemons | ||
| let disabled_daemons = ipc.get_disabled_daemons().await?; | ||
| let mut tasks = Vec::new(); | ||
|
|
||
| for id in ids { | ||
| if disabled_daemons.contains(&id) { | ||
| warn!("Daemon {} is disabled, skipping start", id); | ||
| continue; | ||
| } | ||
|
|
||
| let daemon_data = match pt.daemons.get(&id) { | ||
| Some(d) => { | ||
| let run = d.run.clone(); | ||
| let auto_stop = d | ||
| .auto | ||
| .contains(&crate::pitchfork_toml::PitchforkTomlAuto::Stop); | ||
| let dir = d | ||
| .path | ||
| .as_ref() | ||
| .and_then(|p| p.parent()) | ||
| .map(|p| p.to_path_buf()) | ||
| .unwrap_or_default(); | ||
| let cron_schedule = d.cron.as_ref().map(|c| c.schedule.clone()); | ||
| let cron_retrigger = d.cron.as_ref().map(|c| c.retrigger); | ||
| let retry = d.retry; | ||
| let ready_delay = d.ready_delay; | ||
| let ready_output = d.ready_output.clone(); | ||
| let ready_http = d.ready_http.clone(); | ||
| let ready_port = d.ready_port; | ||
|
|
||
| ( | ||
| run, | ||
| auto_stop, | ||
| dir, | ||
| cron_schedule, | ||
| cron_retrigger, | ||
| retry, | ||
| ready_delay, | ||
| ready_output, | ||
| ready_http, | ||
| ready_port, | ||
| ) | ||
| } | ||
| None => { | ||
| warn!("Daemon {} not found in config, skipping", id); | ||
| continue; | ||
| } | ||
| }; | ||
|
|
||
| let ( | ||
| run, | ||
| auto_stop, | ||
| dir, | ||
| cron_schedule, | ||
| cron_retrigger, | ||
| retry, | ||
| ready_delay, | ||
| ready_output, | ||
| ready_http, | ||
| ready_port, | ||
| ) = daemon_data; | ||
|
|
||
| let ipc_clone = ipc.clone(); | ||
|
|
||
| let task = tokio::spawn(async move { | ||
| let cmd = match shell_words::split(&run) { | ||
| Ok(c) => c, | ||
| Err(e) => { | ||
| error!("Failed to parse command for daemon {}: {}", id, e); | ||
| return (id, None, Some(1)); | ||
| } | ||
| }; | ||
|
|
||
| let start_time = Local::now(); | ||
|
|
||
| let exit_code = match ipc_clone | ||
| .run(RunOptions { | ||
| id: id.clone(), | ||
| cmd, | ||
| shell_pid: None, | ||
| force: false, | ||
| autostop: auto_stop, | ||
| dir, | ||
| cron_schedule, | ||
| cron_retrigger, | ||
| retry, | ||
| retry_count: 0, | ||
| ready_delay: ready_delay.or(Some(3)), | ||
| ready_output, | ||
| ready_http, | ||
| ready_port, | ||
| wait_ready: true, | ||
| }) | ||
| .await | ||
| { | ||
| Ok((_started, exit_code)) => exit_code, | ||
| Err(e) => { | ||
| error!("Failed to start daemon {}: {}", id, e); | ||
| Some(1) | ||
| } | ||
| }; | ||
|
|
||
| (id, Some(start_time), exit_code) | ||
| }); | ||
|
|
||
| tasks.push(task); | ||
| } | ||
|
|
||
| // Wait for all tasks to complete | ||
| let mut any_failed = false; | ||
| let mut successful_daemons: Vec<(String, DateTime<Local>)> = Vec::new(); | ||
|
|
||
| for task in tasks { | ||
| match task.await { | ||
| Ok((id, start_time, exit_code)) => { | ||
| if exit_code.is_some() { | ||
| any_failed = true; | ||
| } else if let Some(start_time) = start_time { | ||
| successful_daemons.push((id, start_time)); | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| } | ||
| Err(e) => { | ||
| error!("Task panicked: {}", e); | ||
| any_failed = true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Show startup logs for successful daemons (unless --quiet) | ||
| if !self.quiet { | ||
| for (id, start_time) in successful_daemons { | ||
| if let Err(e) = print_startup_logs(&id, start_time) { | ||
| debug!("Failed to print startup logs for {}: {}", id, e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if any_failed { | ||
| std::process::exit(1); | ||
| } | ||
| Ok(()) | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.