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: Start restructuring config reloading

Browse source
This commit is contained in:
Vicki Pfau 2024-05-15 19:11:17 -07:00 • committed by Jeremy Whiting
parent f30c54c907
commit 23267c65e0
3 changed files with 55 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/daemon/mod.rs
View file

@ -6,7 +6,7 @@
*/
use anyhow::{anyhow, ensure, Result};
use tokio::signal::unix::{signal, Signal, SignalKind};
use tokio::signal::unix::{signal, SignalKind};
use tokio::task::JoinSet;
use tokio_util::sync::CancellationToken;
use tracing::{error, info};
@ -14,9 +14,11 @@ use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::registry::LookupSpan;
use zbus::connection::Connection;
use crate::daemon::config::read_config;
use crate::sls::{LogLayer, LogReceiver};
use crate::{reload, Service};
use crate::Service;
mod config;
mod root;
mod user;
@ -26,8 +28,6 @@ pub use user::daemon as user;
pub(crate) struct Daemon {
services: JoinSet<Result<()>>,
token: CancellationToken,
sigterm: Signal,
sigquit: Signal,
}
impl Daemon {
@ -43,24 +43,18 @@ impl Daemon {
let subscriber = subscriber.with(remote_logger);
tracing::subscriber::set_global_default(subscriber)?;
let sigterm = signal(SignalKind::terminate())?;
let sigquit = signal(SignalKind::quit())?;
let mut daemon = Daemon {
services,
token,
sigterm,
sigquit,
};
let mut daemon = Daemon { services, token };
daemon.add_service(log_receiver);
Ok(daemon)
}
pub(crate) fn add_service<S: Service + 'static>(&mut self, service: S) {
let token = self.token.clone();
pub(crate) fn add_service<S: Service + 'static>(&mut self, service: S) -> CancellationToken {
let token = self.token.child_token();
let moved_token = token.clone();
self.services
.spawn(async move { service.start(token).await });
.spawn(async move { service.start(moved_token).await });
token
}
pub(crate) async fn run(&mut self) -> Result<()> {
@ -69,18 +63,39 @@ impl Daemon {
"Can't run a daemon with no services attached."
);
let mut res = tokio::select! {
e = self.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 = self.sigterm.recv() => e.ok_or(anyhow!("SIGTERM machine broke")),
_ = self.sigquit.recv() => Err(anyhow!("Got SIGQUIT")),
e = reload() => e,
}
.inspect_err(|e| error!("Encountered error running: {e}"));
let mut res = loop {
let mut sigterm = signal(SignalKind::terminate())?;
let mut sigquit = signal(SignalKind::quit())?;
let mut sighup = signal(SignalKind::hangup())?;
let res = tokio::select! {
e = self.services.join_next() => match e.unwrap() {
Ok(Ok(())) => Ok(()),
Ok(Err(e)) => Err(e),
Err(e) => Err(e.into())
},
_ = tokio::signal::ctrl_c() => break Ok(()),
e = sigterm.recv() => match e {
Some(_) => Ok(()),
None => Err(anyhow!("SIGTERM machine broke")),
},
e = sighup.recv() => match e {
Some(_) => {
if let Err(error) = read_config().await {
error!("Failed to reload configuration: {error}");
}
Ok(())
}
None => Err(anyhow!("SIGHUP machine broke")),
},
_ = sigquit.recv() => Err(anyhow!("Got SIGQUIT")),
}
.inspect_err(|e| error!("Encountered error running: {e}"));
match res {
Ok(()) => continue,
r => break r,
}
};
self.token.cancel();
info!("Shutting down");