archives/steamos-manager
archives/steamos-manager
2
0
Fork 1
mirror of https://gitlab.steamos.cloud/holo/steamos-manager.git synced 2025-07-12 01:12:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: Wait on ctrl-c

Browse source
This commit is contained in:
Vicki Pfau 2024-03-19 18:13:35 -07:00
parent 7e262a1d96
commit cdf4297f9f
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -8,7 +8,7 @@ strip="symbols"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
tokio = { version = "1", features = ["fs", "process", "io-std", "rt-multi-thread", "macros"] } tokio = { version = "1", features = ["fs", "io-std", "macros", "process", "rt-multi-thread", "signal"] }
tracing = { version = "0.1", default-features = false } tracing = { version = "0.1", default-features = false }
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt"] } tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt"] }
zbus = { version = "4", features = ["tokio"] } zbus = { version = "4", features = ["tokio"] }

12
src/main.rs
View file

@ -23,11 +23,12 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
use anyhow::Result; use anyhow::{Error, Result};
use tokio::signal::unix::{signal, SignalKind};
use tracing_subscriber; use tracing_subscriber;
use zbus::ConnectionBuilder; use zbus::ConnectionBuilder;
pub mod manager; mod manager;
#[tokio::main] #[tokio::main]
async fn main() -> Result<()> { async fn main() -> Result<()> {
@ -36,6 +37,8 @@ async fn main() -> Result<()> {
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();
let mut sigterm = signal(SignalKind::terminate())?;
let manager = manager::SMManager::new()?; let manager = manager::SMManager::new()?;
let _system_connection = ConnectionBuilder::system()? let _system_connection = ConnectionBuilder::system()?
@ -44,7 +47,8 @@ async fn main() -> Result<()> {
.build() .build()
.await?; .await?;
loop { tokio::select! {
std::future::pending::<()>().await; e = sigterm.recv() => e.ok_or(Error::msg("SIGTERM pipe broke")),
e = tokio::signal::ctrl_c() => Ok(e?),
} }
} }