diff --git a/src/database.rs b/src/database.rs index 0485174..0e9ee7a 100644 --- a/src/database.rs +++ b/src/database.rs @@ -6,7 +6,7 @@ use std::sync::{Arc, Mutex}; pub type DatabaseHandle = Arc; /// Our "database" which contains all known users (local and federated) -#[derive(Debug, Serialize, Deserialize)] +#[derive(Debug)] pub struct Database { pub users: Mutex>, } diff --git a/src/main.rs b/src/main.rs index 6c256b4..d7badfc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -24,7 +24,7 @@ mod http; mod objects; mod utils; -#[derive(Debug, Clone, Serialize, Deserialize, FromRedisValue, ToRedisArgs)] +#[derive(Debug, Clone)] struct State { database: Arc, } @@ -87,9 +87,9 @@ async fn main() -> actix_web::Result<(), anyhow::Error> { users: Mutex::new(vec![local_user]), }); - let state: State = con.get("ap-layer-db").await.unwrap_or(State { + let state: State = State { database: new_database, - }); + }; let data = FederationConfig::builder() .domain(env::var("FEDERATED_DOMAIN").expect("FEDERATED_DOMAIN must be set")) @@ -144,8 +144,7 @@ async fn main() -> actix_web::Result<(), anyhow::Error> { } } - info!("memory-saving 'db' in redis.."); - con.set("ap-layer-db", &state).await?; + info!("Main thread shutdown.."); Ok(()) } diff --git a/src/objects/person.rs b/src/objects/person.rs index 0f03810..d9439ea 100644 --- a/src/objects/person.rs +++ b/src/objects/person.rs @@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize}; use std::fmt::Debug; use url::Url; -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone)] pub struct DbUser { pub name: String, pub ap_id: ObjectId,