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

devirtualize service Data traits

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-05-27 03:17:20 +00:00
parent a6edaad6fc
commit 7ad7badd60
64 changed files with 1190 additions and 1176 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/service/globals/mod.rs
View file

@ -1,3 +1,5 @@
use conduit::Server;
mod client;
mod data;
pub(super) mod emerg_access;
@ -33,12 +35,12 @@ use tracing::{error, trace};
use url::Url;
use utils::MutexMap;
use crate::{services, Config, Result};
use crate::{services, Config, KeyValueDatabase, Result};
type RateLimitState = (Instant, u32); // Time if last failed try, number of failed tries
pub struct Service {
pub db: Arc<dyn Data>,
pub db: Data,
pub config: Config,
pub cidr_range_denylist: Vec<IPAddress>,
@ -62,7 +64,9 @@ pub struct Service {
}
impl Service {
pub fn load(db: Arc<dyn Data>, config: &Config) -> Result<Self> {
pub fn build(server: &Arc<Server>, db: &Arc<KeyValueDatabase>) -> Result<Self> {
let config = &server.config;
let db = Data::new(db);
let keypair = db.load_keypair();
let keypair = match keypair {