From 17a0ddd2f23577e2e567bef3bacc43fab316c891 Mon Sep 17 00:00:00 2001 From: Nicolas Patry Date: Mon, 29 Apr 2024 13:48:59 +0000 Subject: [PATCH] Reuse our wrapper. --- launcher/src/main.rs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/launcher/src/main.rs b/launcher/src/main.rs index a277a606..ca6aa8dd 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -683,12 +683,7 @@ fn shard_manager( // We received a shutdown signal if shutdown.load(Ordering::SeqCst) { - signal::kill(Pid::from_raw(p.id() as i32), Signal::SIGTERM).unwrap(); - if let Err(err) = p.wait() { - tracing::error!("Error in shard termination {err:?}"); - } else { - tracing::info!("Shard terminated"); - } + terminate("shard", p, Duration::from_secs(90)).unwrap(); return; } @@ -1248,7 +1243,6 @@ fn terminate(process_name: &str, mut process: Child, timeout: Duration) -> io::R signal::kill(Pid::from_raw(process.id() as i32), Signal::SIGTERM).unwrap(); tracing::info!("Waiting for {process_name} to gracefully shutdown"); - while terminate_time.elapsed() < timeout { if let Some(status) = process.try_wait()? { tracing::info!("{process_name} terminated"); @@ -1256,7 +1250,6 @@ fn terminate(process_name: &str, mut process: Child, timeout: Duration) -> io::R } sleep(Duration::from_millis(100)); } - tracing::info!("Killing {process_name}"); process.kill()?;