diff --git a/crates/api-grub/src/main.rs b/crates/api-grub/src/main.rs index 208d646..bbd48ba 100644 --- a/crates/api-grub/src/main.rs +++ b/crates/api-grub/src/main.rs @@ -21,6 +21,7 @@ async fn main() -> Result<()>{ // config update channel let (tx, mut rx) = mpsc::channel::(1); // futures + // todo : rewrite with spawn let config_fut = init_config_grub_mechanism(&tx); let grub_fut = init_api_grub_mechanism(config, &mut rx); diff --git a/crates/config-delivery/src/delivery.rs b/crates/config-delivery/src/delivery.rs index 287b567..c75bbf9 100644 --- a/crates/config-delivery/src/delivery.rs +++ b/crates/config-delivery/src/delivery.rs @@ -3,7 +3,7 @@ use anyhow::{Error, Result}; use integr_structs::api::ApiConfig; -use tokio::time::{sleep, Instant}; +use tokio::time::{sleep, Duration}; use tokio::net::UnixStream; use std::env; use tokio::sync::mpsc::Receiver; @@ -31,15 +31,16 @@ pub async fn init_delivery_mech(rx: ConfigGateway) -> Result<()> { match UnixSocketConsumer::ApiGrubber.get_stream_object().await { Ok(socket) => { socket.try_write(to_string_pretty(&config)?.as_bytes())?; + info!("New api config was pulled"); }, Err(er) => { error!("Cannot coonect to ApiGrubber Unix-Socket due to {er}"); } } + sleep(Duration::from_secs(3)).await; } // let api_sock = UnixSocketConsumer::ApiGrubber.get_stream_object().await?; // let preproc_sock = UnixSocketConsumer::Preproc.get_stream_object().await?; - Ok(()) } impl UnixSocketConsumer { @@ -52,12 +53,13 @@ impl UnixSocketConsumer { } } -async fn check_unix_socket_file(path: &str) -> bool { - std::path::Path::new(path).exists() -} +// async fn check_unix_socket_file(path: &str) -> bool { +// std::path::Path::new(path).exists() +// } -#[cfg(tests)] +#[cfg(test)] mod delivery_unittests { + #[allow(unused_imports)] use super::*; use tokio::test; diff --git a/crates/config-delivery/src/main.rs b/crates/config-delivery/src/main.rs index 4e20dc5..7f8803b 100644 --- a/crates/config-delivery/src/main.rs +++ b/crates/config-delivery/src/main.rs @@ -10,7 +10,6 @@ use tokio::sync::mpsc; use log::{info, error}; use integration::init_integration_mech; use delivery::init_delivery_mech; -use tokio::task::JoinHandle; use std::sync::Arc; // Arch :