From 7b0fa3911ddc737e4cdd126adce9869f937c7557 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 24 Jan 2025 18:26:22 -0800 Subject: [PATCH] daemon: Fix shutting down on getting SIGTERM --- src/daemon/mod.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/daemon/mod.rs b/src/daemon/mod.rs index acd26a4..d8cecc7 100644 --- a/src/daemon/mod.rs +++ b/src/daemon/mod.rs @@ -132,10 +132,16 @@ impl Daemon { Ok(Err(e)) => Err(e), Err(e) => Err(e.into()) }, - _ = tokio::signal::ctrl_c() => break Ok(()), + _ = tokio::signal::ctrl_c() => { + info!("Got SIGINT, shutting down"); + break Ok(()); + } e = sigterm.recv() => match e { - Some(()) => Ok(()), - None => Err(anyhow!("SIGTERM machine broke")), + Some(()) => { + info!("Got SIGTERM, shutting down"); + break Ok(()); + } + None => Err(anyhow!("SIGTERM pipe broke")), }, e = sighup.recv() => match e { Some(()) => { @@ -148,7 +154,7 @@ impl Daemon { } } } - None => Err(anyhow!("SIGHUP machine broke")), + None => Err(anyhow!("SIGHUP pipe broke")), }, msg = self.channel.recv() => match msg { Some(msg) => {