minor improvements

Author: matthieugouel

src/agent/handler.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use caracat::models::Probe;
 use ipnet::IpNet;
-use log::info;
+use log::{info, trace};
 use rand::seq::SliceRandom;
 use rand::thread_rng;
 use rdkafka::consumer::{CommitMode, Consumer};
@@ -76,6 +76,9 @@ fn generate_probes(target: &Target) -> Result<Vec<Probe>> {
 }
 
 pub async fn handle(config: &AppConfig) -> Result<()> {
+    trace!("Agent handler");
+    trace!("{:?}", config);
+
     // Test input ID
     if !test_id(Some(config.agent.agent_id.clone()), None, None) {
         return Err(anyhow::anyhow!("Invalid agent ID"));

src/client/handler.rs

@@ -1,11 +1,15 @@
 use anyhow::Result;
+use log::trace;
 
 use crate::auth::{KafkaAuth, SaslAuth};
 use crate::client::producer::produce;
 use crate::config::AppConfig;
 use crate::target::decode_target;
 
 pub async fn handle(config: &AppConfig, agents: &str, target: &str) -> Result<()> {
+    trace!("Client handler");
+    trace!("{:?}", config);
+
     // Configure Kafka authentication
     let auth = match config.kafka.auth_protocol.as_str() {
         "PLAINTEXT" => KafkaAuth::PlainText,

src/config.rs

@@ -74,15 +74,16 @@ pub struct AppConfig {
     pub kafka: KafkaConfig,
 }
 
-pub fn load_config(config_path: &str) -> Config {
+fn load_config(config_path: &str) -> Config {
     Config::builder()
         .add_source(config::File::with_name(config_path))
         .add_source(config::Environment::with_prefix("SAIMIRIS"))
         .build()
         .unwrap()
 }
 
-pub fn agent_config(config: Config) -> AppConfig {
+pub fn app_config(config_path: &str) -> AppConfig {
+    let config = load_config(config_path);
     AppConfig {
         // Caracat configuration
         caracat: CaracatConfig {

src/main.rs

@@ -13,7 +13,7 @@ use env_logger::Builder;
 use log::error;
 use std::io::Write;
 
-use crate::config::{agent_config, load_config};
+use crate::config::app_config;
 
 #[derive(Debug, Parser)]
 #[clap(name = "Saimiris", version)]
@@ -77,10 +77,8 @@ async fn main() -> Result<()> {
 
     match cli.command {
         Command::Agent { config } => {
-            let app_config = load_config(&config);
-            let agent_config = agent_config(app_config);
-
-            match agent::handle(&agent_config).await {
+            let app_config = app_config(&config);
+            match agent::handle(&app_config).await {
                 Ok(_) => (),
                 Err(e) => error!("Error: {}", e),
             }
@@ -90,10 +88,8 @@ async fn main() -> Result<()> {
             agents,
             target,
         } => {
-            let app_config = load_config(&config);
-            let agent_config = agent_config(app_config);
-
-            match client::handle(&agent_config, &agents, &target).await {
+            let app_config = app_config(&config);
+            match client::handle(&app_config, &agents, &target).await {
                 Ok(_) => (),
                 Err(e) => error!("Error: {}", e),
             }