mirror of
https://gitlab.steamos.cloud/holo/steamos-manager.git
synced 2025-07-13 01:41:59 -04:00
daemon: Fix shutting down on getting SIGTERM
This commit is contained in:
parent
79716db2e0
commit
7b0fa3911d
1 changed files with 10 additions and 4 deletions
|
@ -132,10 +132,16 @@ impl<C: DaemonContext> Daemon<C> {
|
||||||
Ok(Err(e)) => Err(e),
|
Ok(Err(e)) => Err(e),
|
||||||
Err(e) => Err(e.into())
|
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 {
|
e = sigterm.recv() => match e {
|
||||||
Some(()) => Ok(()),
|
Some(()) => {
|
||||||
None => Err(anyhow!("SIGTERM machine broke")),
|
info!("Got SIGTERM, shutting down");
|
||||||
|
break Ok(());
|
||||||
|
}
|
||||||
|
None => Err(anyhow!("SIGTERM pipe broke")),
|
||||||
},
|
},
|
||||||
e = sighup.recv() => match e {
|
e = sighup.recv() => match e {
|
||||||
Some(()) => {
|
Some(()) => {
|
||||||
|
@ -148,7 +154,7 @@ impl<C: DaemonContext> Daemon<C> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => Err(anyhow!("SIGHUP machine broke")),
|
None => Err(anyhow!("SIGHUP pipe broke")),
|
||||||
},
|
},
|
||||||
msg = self.channel.recv() => match msg {
|
msg = self.channel.recv() => match msg {
|
||||||
Some(msg) => {
|
Some(msg) => {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue