diff --git a/docker-compose.yml b/docker-compose.yml index e5b33ca..ff72c6c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: APP_ENV: development LOG: debug TZ: "Europe/Paris" - EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiNjBmOTY4MDktNDg0Mi00YzBmLWFiMjgtMDY2NDVlZTJkYWU2IiwibWFzdGVyS2V5QjY0IjoiMUh0djdtWCtYVkJxL0IzUEV2WDlZZjlQeUdVZW5oRHlXemo5THRqNW90WT0ifQ==" + EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiZWZhYTM0YTQtZDY1NC00OGQ3LTgwNDYtNjRkMWExYTA1M2FlIiwibWFzdGVyS2V5QjY0IjoiMUh0djdtWCtYVkJxL0IzUEV2WDlZZjlQeUdVZW5oRHlXemo5THRqNW90WT0ifQ==" #CHUNK_SIZE_MB: "1" #POOLING: 1 #DATABASES_CONFIG_FILE: "config.toml" diff --git a/src/services/status.rs b/src/services/status.rs index 3cb61f7..1445588 100644 --- a/src/services/status.rs +++ b/src/services/status.rs @@ -1,18 +1,18 @@ #![allow(dead_code)] use crate::core::context::Context; +use crate::domain::factory::DatabaseFactory; use crate::services::api::endpoints::status::DatabasePayload; -use crate::services::api::models::agent::status::PingResult; use crate::services::api::models::agent::status::DatabaseStorage; +use crate::services::api::models::agent::status::PingResult; use crate::services::config::DatabaseConfig; use crate::settings::CONFIG; use crate::utils::file::decrypt_json_gcm; +use futures_util::future::try_join_all; use reqwest::Client; use std::error::Error; use std::sync::Arc; -use futures_util::future::try_join_all; use tracing::info; -use crate::domain::factory::DatabaseFactory; pub struct StatusService { ctx: Arc, @@ -30,12 +30,12 @@ impl StatusService { pub async fn ping(&self, databases: &[DatabaseConfig]) -> Result> { let edge_key = &self.ctx.edge_key; - let databases_payload: Vec = try_join_all( - databases.into_iter().map(|db| async move { + let databases_payload: Vec = + try_join_all(databases.into_iter().map(|db| async move { let db_engine = DatabaseFactory::create_for_backup(db.clone()).await; let reachable = db_engine.ping().await?; - info!("Ping {} => {:?}",db.name, reachable); + info!("Ping {} => {:?}", db.name, reachable); Ok::(DatabasePayload { name: &db.name, @@ -43,8 +43,8 @@ impl StatusService { generated_id: &db.generated_id, ping_status: reachable, }) - }) - ).await?; + })) + .await?; let version_str = CONFIG.app_version.as_str(); let mut result = self @@ -61,15 +61,13 @@ impl StatusService { .as_deref() .ok_or("storages_encrypted set but storages_ciphertext missing")?; - let plaintext = - decrypt_json_gcm(ciphertext, &edge_key.master_key_b64) - .map_err(|e| format!("Failed to decrypt storages: {e}"))?; + let plaintext = decrypt_json_gcm(ciphertext, &edge_key.master_key_b64) + .map_err(|e| format!("Failed to decrypt storages: {e}"))?; db.storages = serde_json::from_slice::>(&plaintext) .map_err(|e| format!("Failed to parse decrypted storages: {e}"))?; } } - Ok(result) } }