Merge pull request #83 from jabibamman/chore/logger-cli-enhanced

Chore: Update logging levels based on flags

cli/src/operation.rs

@@ -6,8 +6,9 @@ mod operation_tests {
         CliServerArgs {
             hostname: "127.0.0.1".to_string(),
             port: 8787,
-            verbose: false,
-            debug: false,
+            verbose: 0,
+            debug: 0,
+            trace: 0,
             width: 1,
             height: 1,
         }
@@ -22,6 +23,7 @@ mod operation_tests {
             worker_name: "worker".to_string(),
             verbose: args.verbose.clone(),
             debug: args.debug.clone(),
+            trace: args.trace.clone(),
             open: false,
             save: false,
         };
@@ -38,6 +40,7 @@ mod operation_tests {
             port: args.port.clone(),
             verbose: args.verbose.clone(),
             debug: args.debug.clone(),
+            trace: args.trace.clone(),
             width: 1,
             height: 1,
         };

cli/src/parser.rs

@@ -33,14 +33,19 @@ pub struct CliClientArgs {
     pub worker_name: String,
 
     /// Optional: Add a flag to enable/disable logging.
-    /// Default: false
-    #[clap(short = 'v', long = "verbose", default_value = "false")]
-    pub verbose: bool,
+    /// Default: 0
+    #[clap(short = 'v', long = "verbose",  action = clap::ArgAction::Count)]
+    pub verbose: u8,
 
     /// Optional: Add a flag to enable/disable debug mode.
-    /// Default: false
-    #[clap(short = 'd', long = "debug", default_value = "false")]
-    pub debug: bool,
+    /// Default: 0
+    #[clap(short = 'd', long = "debug", action = clap::ArgAction::Count)]
+    pub debug: u8,
+
+    /// Optional: Add a flag to enable/disable trace mode.
+    /// Default: 0
+    #[clap(short = 't', long = "trace", action = clap::ArgAction::Count)]
+    pub trace: u8,
 
     /// Optional: Add a flag to enable/disable opening the browser.
     /// Default: false
@@ -84,14 +89,19 @@ pub struct CliServerArgs {
     pub port: u16,
 
     /// Optional: Add a flag to enable/disable logging.
-    /// Default: false
-    #[clap(short = 'v', long = "verbose", default_value = "false")]
-    pub verbose: bool,
+    /// Default: 0
+    #[clap(short = 'v', long = "verbose",  action = clap::ArgAction::Count)]
+    pub verbose: u8,
 
     /// Optional: Add a flag to enable/disable debug mode.
-    /// Default: false
-    #[clap(short = 'd', long = "debug", default_value = "false")]
-    pub debug: bool,
+    /// Default: 0
+    #[clap(short = 'd', long = "debug", action = clap::ArgAction::Count)]
+    pub debug: u8,
+
+    /// Optional: Add a flag to enable/disable trace mode.
+    /// Default: 0
+    #[clap(short = 't', long = "trace", action = clap::ArgAction::Count)]
+    pub trace: u8,
 
     /// Optional: Add a flag to edit the width and height of the window.
     /// Default: 1200

client/src/main.rs

@@ -1,4 +1,4 @@
-use log::{error, info};
+use log::{error, info, trace};
 use networking::{connect_to_server, process_fragment_task, receive_fragment_task, send_request};
 use shared::{types::error::FractalError, utils::fragment_request_impl::FragmentRequestOperation};
 
@@ -11,17 +11,19 @@ use shared::types::messages::FragmentRequest;
 
 fn main() -> Result<(), FractalError> {
     let cli_args: CliClientArgs = CliClientArgs::parse();
-    shared::logger::init_logger(cli_args.verbose, cli_args.debug)?;
+    shared::logger::init_logger(cli_args.verbose, cli_args.debug, cli_args.trace)?;
 
     let serialized_request =
         FragmentRequest::new(cli_args.worker_name.clone(), 1000).serialize()?;
 
     let mut stream = connect_to_server(&cli_args)?;
     send_request(&mut stream, &serialized_request)?;
+    log::trace!("Sent request to server");
 
     loop {
         match receive_fragment_task(&mut stream) {
             Ok(Some((fragment_task, data))) => {
+                trace!("Received fragment task: {:?}", fragment_task);
                 stream = process_fragment_task(fragment_task, data, &cli_args)?;
             }
             Ok(None) => {

client/src/networking.rs

@@ -6,7 +6,7 @@ use std::{
 
 use cli::parser::CliClientArgs;
 use image::{ImageBuffer, Rgb};
-use log::{debug, error, info};
+use log::{debug, error, info, trace};
 use server::services::{
     reader::get_response,
     write::{write, write_img},
@@ -137,7 +137,7 @@ pub fn process_fragment_task(
         get_file_path("julia", dir_path_buf, get_extension_str(FileExtension::PNG))?;
     let (img, pixel_data_bytes, pixel_intensity_matrice) = generate_fractal_set(task.clone())?;
 
-    debug!("Pixel data bytes: {:?}", pixel_data_bytes);
+    trace!("Pixel data bytes: {:?}", pixel_data_bytes);
 
     let pixel_data = convert_to_pixel_data(pixel_data_bytes.clone(), task.clone());
 
@@ -148,7 +148,7 @@ pub fn process_fragment_task(
         vec_data.extend(pixel_intensity_matrice[i].count.to_be_bytes());
     }
 
-    debug!("Vec data: {:?}", vec_data);
+    trace!("Vec data: {:?}", vec_data);
 
     if cli_args.save {
         save_fractal_image(img.clone(), &img_path)?;

server/src/main.rs

@@ -7,7 +7,7 @@ use shared::types::error::FractalError;
 
 fn main() -> Result<(), FractalError> {
     let cli_args: CliServerArgs = CliServerArgs::parse();
-    shared::logger::init_logger(cli_args.verbose, cli_args.debug)?;
+    shared::logger::init_logger(cli_args.verbose, cli_args.debug, cli_args.trace)?;
     env::set_var("RESOLUTION_WIDTH", cli_args.width.to_string());
     env::set_var("RESOLUTION_HEIGHT", cli_args.height.to_string());
 

shared/src/logger/mod.rs

@@ -2,19 +2,18 @@ use crate::types::error::FractalError;
 use env_logger::{Builder, Env};
 use log::LevelFilter;
 
-pub fn init_logger(verbose: bool, debug: bool) -> Result<(), FractalError> {
+pub fn init_logger(verbose: u8, debug: u8, trace: u8) -> Result<(), FractalError> {
+    let log_level = match (verbose, debug, trace) {
+        (0, 0, 0) => LevelFilter::Error, // default
+        (_, 1, 0) => LevelFilter::Debug, // -d
+        (1, _, _) => LevelFilter::Info,  // -v
+        (_, _, 1) => LevelFilter::Trace, // -t
+        _ => LevelFilter::Warn,          // multiple flags
+    };
+
     let mut builder = Builder::from_env(Env::default());
 
     builder.format_timestamp(Some(env_logger::TimestampPrecision::Millis));
-
-    let log_level = if debug {
-        LevelFilter::Debug
-    } else if verbose {
-        LevelFilter::Info
-    } else {
-        LevelFilter::Error
-    };
-
     builder.filter_level(log_level);
     builder.init();