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

de-global services for services

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-18 06:37:47 +00:00
parent 992c0a1e58
commit 010e4ee35a
85 changed files with 2480 additions and 1887 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/service/manager.rs
View file

@ -8,13 +8,13 @@ use tokio::{
time::sleep,
};
use crate::{service::Service, Services};
use crate::{service, service::Service, Services};
pub(crate) struct Manager {
manager: Mutex<Option<JoinHandle<Result<()>>>>,
workers: Mutex<Workers>,
server: Arc<Server>,
services: &'static Services,
service: Arc<service::Map>,
}
type Workers = JoinSet<WorkerResult>;
@ -29,7 +29,7 @@ impl Manager {
manager: Mutex::new(None),
workers: Mutex::new(JoinSet::new()),
server: services.server.clone(),
services: crate::services(),
service: services.service.clone(),
})
}
@ -53,9 +53,19 @@ impl Manager {
.spawn(async move { self_.worker().await }),
);
// we can't hold the lock during the iteration with start_worker so the values
// are snapshotted here
let services: Vec<Arc<dyn Service>> = self
.service
.read()
.expect("locked for reading")
.values()
.map(|v| v.0.clone())
.collect();
debug!("Starting service workers...");
for (service, ..) in self.services.service.values() {
self.start_worker(&mut workers, service).await?;
for service in services {
self.start_worker(&mut workers, &service).await?;
}
Ok(())