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

daemon: Split parts of the root main into a reusable struct

Browse source
This commit is contained in:
Vicki Pfau 2024-04-23 19:22:35 -07:00
parent ff6aa760ca
commit ac823a845b
3 changed files with 119 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/root.rs
View file

@ -5,20 +5,17 @@
* SPDX-License-Identifier: MIT
*/
use anyhow::{anyhow, bail, Result};
use tokio::signal::unix::{signal, SignalKind};
use tokio::task::JoinSet;
use tokio_util::sync::CancellationToken;
use tracing::{error, info};
use anyhow::{bail, Result};
use tracing::error;
use tracing_subscriber::prelude::*;
use tracing_subscriber::{fmt, Registry};
use zbus::connection::Connection;
use zbus::ConnectionBuilder;
use crate::daemon::Daemon;
use crate::ds_inhibit::Inhibitor;
use crate::{manager, reload, Service};
use crate::manager;
use crate::sls::ftrace::Ftrace;
use crate::sls::{LogLayer, LogReceiver};
async fn create_connection() -> Result<Connection> {
let connection = ConnectionBuilder::system()?
@ -48,48 +45,13 @@ pub async fn daemon() -> Result<()> {
bail!(e);
}
};
let mut services = JoinSet::new();
let token = CancellationToken::new();
let mut log_receiver = LogReceiver::new(connection.clone()).await?;
let remote_logger = LogLayer::new(&log_receiver).await;
let subscriber = subscriber.with(remote_logger);
tracing::subscriber::set_global_default(subscriber)?;
let mut sigterm = signal(SignalKind::terminate())?;
let mut sigquit = signal(SignalKind::quit())?;
let mut daemon = Daemon::new(subscriber, connection.clone()).await?;
let ftrace = Ftrace::init(connection.clone()).await?;
services.spawn(ftrace.start(token.clone()));
daemon.add_service(ftrace);
let inhibitor = Inhibitor::init().await?;
services.spawn(inhibitor.start(token.clone()));
daemon.add_service(inhibitor);
let mut res = tokio::select! {
e = log_receiver.run() => e,
e = services.join_next() => match e.unwrap() {
Ok(Ok(())) => Ok(()),
Ok(Err(e)) => Err(e),
Err(e) => Err(e.into())
},
_ = tokio::signal::ctrl_c() => Ok(()),
e = sigterm.recv() => e.ok_or(anyhow!("SIGTERM machine broke")),
_ = sigquit.recv() => Err(anyhow!("Got SIGQUIT")),
e = reload() => e,
}
.inspect_err(|e| error!("Encountered error running: {e}"));
token.cancel();
info!("Shutting down");
while let Some(service_res) = services.join_next().await {
res = match service_res {
Ok(Err(e)) => Err(e),
Err(e) => Err(e.into()),
_ => continue,
};
}
res.inspect_err(|e| error!("Encountered error: {e}"))
daemon.run().await
}