feat: improve log level def

azerpas · Apr 20, 2024 · c119363 · c119363
1 parent 08c033c
commit c119363
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 6 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -1,5 +1,3 @@
-use std::env;
-
 use anyhow::Result;
 use bourso_api::client::trade::order::OrderSide;
 use clap::{builder::{PossibleValue, ValueParser}, Arg, Command};
@@ -17,8 +15,6 @@ async fn main() -> Result<()> {
     const VERSION: Option<&str> = option_env!("CARGO_PKG_VERSION");
     debug!("Version: {:?}", VERSION);
 
-    env::set_var("RUST_LOG", "info");
-
     init_logger()?;
 
     let account_arg = Arg::new("account")

diff --git a/src/settings.rs b/src/settings.rs
@@ -47,6 +47,30 @@ pub fn save_settings(settings: &Settings) -> Result<()> {
 
 #[cfg(not(tarpaulin_include))]
 pub fn init_logger() -> Result<()> {
+    use std::env;
+
+    use log::debug;
+
+    let log_level = match env::var("RUST_LOG") {
+        Ok(level) => match level.as_str() {
+            "trace" => LevelFilter::Trace,
+            "debug" => LevelFilter::Debug,
+            "info" => LevelFilter::Info,
+            "warn" => LevelFilter::Warn,
+            "error" => LevelFilter::Error,
+            _ => {
+                env::set_var("RUST_LOG", "info");
+                LevelFilter::Info
+            }
+        },
+        Err(_) => {
+            env::set_var("RUST_LOG", "info");
+            LevelFilter::Info
+        }
+    };
+
+    debug!("Log level: {:?}", log_level);
+
     // Create the .bourso directory if it doesn't exist
     let user_dirs = UserDirs::new().context("Failed to get user directories")?;
     let mut path = user_dirs.home_dir().to_path_buf();
@@ -55,7 +79,6 @@ pub fn init_logger() -> Result<()> {
     fs::create_dir_all(&path)?;
     path = path.join("bourso.log");
 
-    let level = LevelFilter::Info;
     let stderr = ConsoleAppender::builder()
         .target(Target::Stderr)
         .encoder(Box::new(PatternEncoder::new("{h({l})}  {M} > {m}{n}")))
@@ -70,7 +93,7 @@ pub fn init_logger() -> Result<()> {
         .appender(Appender::builder().build("logfile", Box::new(logfile)))
         .appender(
             Appender::builder()
-                .filter(Box::new(ThresholdFilter::new(level)))
+                .filter(Box::new(ThresholdFilter::new(log_level)))
                 .build("stderr", Box::new(stderr)),
         )
         .build(
@@ -84,4 +107,30 @@ pub fn init_logger() -> Result<()> {
     log4rs::init_config(config)?;
 
     Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use std::env;
+
+    use log::LevelFilter;
+
+    #[test]
+    fn test_get_settings() {
+        let f = match env::var("RUST_LOG") {
+            Ok(level) => match level.as_str() {
+                "trace" => LevelFilter::Trace,
+                "debug" => LevelFilter::Debug,
+                "info" => LevelFilter::Info,
+                "warn" => LevelFilter::Warn,
+                "error" => LevelFilter::Error,
+                _ => LevelFilter::Info,
+            },
+            Err(_) => {
+                env::set_var("RUST_LOG", "info");
+                LevelFilter::Info
+            }
+        }; 
+        assert_eq!(f, LevelFilter::Info);
+    }
 }