zaphar/clio
1
0
Fork 0
mirror of https://github.com/zaphar/clio.git synced 2025-07-22 12:09:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: properly cleanup on shutdown

Browse Source
This commit is contained in:
Jeremy Wall 2024-06-05 11:06:57 -04:00
parent 9c5da58363
commit a14ecf4c63
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.rs
View File

@ -1,6 +1,6 @@
use std::convert::From; use std::convert::From;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::{ExitCode, Stdio}; use std::process::{ExitCode, ExitStatus, Stdio};
use anyhow; use anyhow;
use clap::{Parser, ValueEnum}; use clap::{Parser, ValueEnum};
@ -54,6 +54,18 @@ async fn write_pid_file(p: &PathBuf) -> anyhow::Result<()> {
Ok(()) Ok(())
} }
async fn cleanup(
result: std::io::Result<ExitStatus>,
pid_file: &Option<PathBuf>,
) -> anyhow::Result<ExitCode> {
if let Some(p) = pid_file {
tokio::fs::remove_file(p).await?;
}
return Ok(ExitCode::from(
result?.code().expect("No exit code for process") as u8,
));
}
#[tokio::main] #[tokio::main]
async fn main() -> anyhow::Result<ExitCode> { async fn main() -> anyhow::Result<ExitCode> {
let args = Args::parse(); let args = Args::parse();
@ -96,8 +108,8 @@ async fn main() -> anyhow::Result<ExitCode> {
.open(stdout_path) .open(stdout_path)
.await?; .await?;
// TODO(jwall): Write our pidfile somehwere // TODO(jwall): Write our pidfile somehwere
if let Some(p) = args.pid_file { if let Some(p) = &args.pid_file {
write_pid_file(&p).await? write_pid_file(p).await?
} }
// TODO(jwall): Forward all other signals to the running process. // TODO(jwall): Forward all other signals to the running process.
loop { loop {
@ -117,8 +129,8 @@ async fn main() -> anyhow::Result<ExitCode> {
Err(_) => { Err(_) => {
// TODO(zaphar): This likely means the command has broken badly. We should // TODO(zaphar): This likely means the command has broken badly. We should
// do the right thing here. // do the right thing here.
let result = child.wait().await?; let result = child.wait().await;
return Ok(ExitCode::from(result.code().expect("No exit code for process") as u8)); return cleanup(result, &args.pid_file).await;
}, },
} }
} }
@ -135,8 +147,8 @@ async fn main() -> anyhow::Result<ExitCode> {
Err(_) => { Err(_) => {
// TODO(zaphar): This likely means the command has broken badly. We should // TODO(zaphar): This likely means the command has broken badly. We should
// do the right thing here.. // do the right thing here..
let result = child.wait().await?; let result = child.wait().await;
return Ok(ExitCode::from(result.code().expect("No exit code for process") as u8)); return cleanup(result, &args.pid_file).await;
}, },
} }
} }
@ -183,7 +195,7 @@ async fn main() -> anyhow::Result<ExitCode> {
} }
result = child.wait() => { result = child.wait() => {
// The child has finished // The child has finished
return Ok(ExitCode::from(result?.code().expect("No exit code for process") as u8)); return cleanup(result, &args.pid_file).await;
} }
} }
} }