magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add indirection for circular-dependencies between services

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-21 00:21:34 +00:00
parent 3dc91525ce
commit 9b20c6918f
3 changed files with 66 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/service/services.rs
View file

@ -31,24 +31,36 @@ pub struct Services {
pub updates: Arc<updates::Service>,
manager: Mutex<Option<Arc<Manager>>>,
pub(crate) service: Map,
pub(crate) service: Arc<Map>,
pub server: Arc<Server>,
pub db: Arc<Database>,
}
macro_rules! build_service {
($map:ident, $server:ident, $db:ident, $tyname:ty) => {{
let built = <$tyname>::build(Args {
server: &$server,
db: &$db,
service: &$map,
})?;
Arc::get_mut(&mut $map)
.expect("must have mutable reference to services collection")
.insert(built.name().to_owned(), (built.clone(), built.clone()));
trace!("built service #{}: {:?}", $map.len(), built.name());
built
}};
}
impl Services {
#[allow(clippy::cognitive_complexity)]
pub fn build(server: Arc<Server>, db: Arc<Database>) -> Result<Self> {
let mut service: Map = BTreeMap::new();
let mut service: Arc<Map> = Arc::new(BTreeMap::new());
macro_rules! build {
($tyname:ty) => {{
let built = <$tyname>::build(Args {
server: &server,
db: &db,
service: &service,
})?;
service.insert(built.name().to_owned(), (built.clone(), built.clone()));
built
}};
($srv:ty) => {
build_service!(service, server, db, $srv)
};
}
Ok(Self {
@ -167,7 +179,7 @@ impl Services {
fn interrupt(&self) {
debug!("Interrupting services...");
for (name, (service, ..)) in &self.service {
for (name, (service, ..)) in self.service.iter() {
trace!("Interrupting {name}");
service.interrupt();
}