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

14
src/service/appservice/mod.rs
View file

@ -12,7 +12,7 @@ use ruma::{
};
use tokio::sync::RwLock;
use crate::services;
use crate::{sending, Dep};
/// Compiled regular expressions for a namespace
#[derive(Clone, Debug)]
@ -118,9 +118,14 @@ impl TryFrom<Registration> for RegistrationInfo {
pub struct Service {
pub db: Data,
services: Services,
registration_info: RwLock<BTreeMap<String, RegistrationInfo>>,
}
struct Services {
sending: Dep<sending::Service>,
}
impl crate::Service for Service {
fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
let mut registration_info = BTreeMap::new();
@ -138,6 +143,9 @@ impl crate::Service for Service {
Ok(Arc::new(Self {
db,
services: Services {
sending: args.depend::<sending::Service>("sending"),
},
registration_info: RwLock::new(registration_info),
}))
}
@ -178,7 +186,9 @@ impl Service {
// deletes all active requests for the appservice if there are any so we stop
// sending to the URL
services().sending.cleanup_events(service_name.to_owned())?;
self.services
.sending
.cleanup_events(service_name.to_owned())?;
Ok(())
}