Compare commits

..

No commits in common. "a225ec690ee146cb2509c6c58bc149b7810c72c0" and "c607bdc0d6c5520073f5cda336b9e433310a952b" have entirely different histories.

3 changed files with 6 additions and 75 deletions

View File

@ -6,41 +6,13 @@ use integr_structs::api::ApiConfig;
use tokio::time::{sleep, Instant}; use tokio::time::{sleep, Instant};
use tokio::net::UnixStream; use tokio::net::UnixStream;
use std::env; use std::env;
use tokio::sync::mpsc::Receiver;
use log::{info, error};
use serde_json::to_string_pretty;
#[derive(Debug)]
enum UnixSocketConsumer { enum UnixSocketConsumer {
ApiGrubber, ApiGrubber,
Preproc, Preproc,
} }
// to create us-client // to create us-client
struct UnixSocketClient; struct UnixSocketClient;
// to catch new configs from integr submod
type ConfigGateway = Receiver<ApiConfig>;
pub async fn init_delivery_mech(rx: ConfigGateway) -> Result<()> {
let mut rx = rx;
loop {
while rx.is_empty() {
continue;
};
info!("New config was pulled. Redirecting it ...");
let config = rx.recv().await.unwrap();
match UnixSocketConsumer::ApiGrubber.get_stream_object().await {
Ok(socket) => {
socket.try_write(to_string_pretty(&config)?.as_bytes())?;
},
Err(er) => {
error!("Cannot coonect to ApiGrubber Unix-Socket due to {er}");
}
}
}
// let api_sock = UnixSocketConsumer::ApiGrubber.get_stream_object().await?;
// let preproc_sock = UnixSocketConsumer::Preproc.get_stream_object().await?;
Ok(())
}
impl UnixSocketConsumer { impl UnixSocketConsumer {
pub async fn get_stream_object(&self) -> Result<UnixStream> { pub async fn get_stream_object(&self) -> Result<UnixStream> {
@ -48,7 +20,7 @@ impl UnixSocketConsumer {
UnixSocketConsumer::ApiGrubber => env::var("API_GRUBBER_SOCKET")?, UnixSocketConsumer::ApiGrubber => env::var("API_GRUBBER_SOCKET")?,
UnixSocketConsumer::Preproc => env::var("PREPROC_SOCKET")?, UnixSocketConsumer::Preproc => env::var("PREPROC_SOCKET")?,
}; };
UnixStream::connect(socket_file).await.or_else(|_| Err(Error::msg(format!("Cannot create {:?} Unix-Socket client", self)))) UnixStream::connect(socket_file).await.or_else(|_| Err(Error::msg("Cannot create Unix-Socket client")))
} }
} }

View File

@ -1,20 +1 @@
use std::sync::Arc; // mock
use tokio::sync::mpsc::Sender;
use integr_structs::api::ApiConfig;
use anyhow::Result;
use tokio::time::{sleep, Duration};
// mock
type Worker = Arc<Sender<ApiConfig>>;
#[allow(dead_code, unused_variables)]
pub async fn init_integration_mech(tx: Worker) -> Result<()> {
loop {
sleep(Duration::from_secs(5)).await;
let conf = ApiConfig::default();
tx.send(conf).await?;
}
// Ok(())
}

View File

@ -2,16 +2,11 @@ mod delivery;
mod integration; mod integration;
mod logger; mod logger;
use integr_structs::api::ApiConfig;
use logger::setup_logger; use logger::setup_logger;
use dotenv::dotenv; use dotenv::dotenv;
use anyhow::Result; use anyhow::Result;
use tokio::sync::mpsc; use tokio::sync::mpsc;
use log::{info, error}; use log::info;
use integration::init_integration_mech;
use delivery::init_delivery_mech;
use tokio::task::JoinHandle;
use std::sync::Arc;
// Arch : // Arch :
// 1) 2 Unix-Socket client (for api grub and preproc) :: i think its a continious process for events when services are unavailable // 1) 2 Unix-Socket client (for api grub and preproc) :: i think its a continious process for events when services are unavailable
@ -21,27 +16,10 @@ use std::sync::Arc;
#[tokio::main(flavor = "multi_thread")] #[tokio::main(flavor = "multi_thread")]
async fn main() -> Result<()> { async fn main() -> Result<()> {
let _ = setup_logger().await?; let _ = setup_logger().await?;
info!("Pulling env vars from .env file if exists ...");
dotenv().ok(); dotenv().ok();
info!("Pulling env vars from .env file if exists ...");
//
let (tx, rx) = mpsc::channel::<ApiConfig>(1);
let tx = Arc::new(tx);
let integr_jh = tokio::spawn(
async move {
if let Err(er) = init_integration_mech(tx).await {
error!("Error in integration submodule during to: {}", er);
}
}
);
let deliv_future = tokio::spawn(async move {
if let Err(er) = init_delivery_mech(rx).await {
error!("Error in delivery submodule during to: {}", er);
}
});
// for deliv adding
// let action_vec: Vec<JoinHandle<()>> = vec![integr_jh, deliv_future];
for event in vec![integr_jh, deliv_future] {
let _ = event.await;
}
Ok(()) Ok(())
} }