replace more usage of env logger with simplelogger

Author: Heliozoa

plugins/python3/Cargo.toml

@@ -17,6 +17,5 @@ dunce = "1"
 
 [dev-dependencies]
 simple_logger = "1"
-env_logger = "0.8"
 tempfile = "3"
 zip = "0.5"

tmc-client/src/response.rs

@@ -445,7 +445,9 @@ mod test {
     use super::*;
 
     fn init() {
-        let _ = env_logger::builder().is_test(true).try_init();
+        use log::*;
+        use simple_logger::*;
+        let _ = SimpleLogger::new().with_level(LevelFilter::Debug).init();
     }
 
     #[test]

tmc-client/tests/compare_server_results.rs

@@ -13,13 +13,16 @@ use url::Url;
 const TMC_ROOT: &str = "https://tmc.mooc.fi/";
 
 fn init() {
-    if env::var("RUST_LOG").is_err() {
-        env::set_var(
-            "RUST_LOG",
-            "debug,j4rs=warn,hyper=warn,reqwest=warn,serde_xml_rs=warn,rustls=warn",
-        );
-    }
-    let _ = env_logger::builder().is_test(true).try_init();
+    use log::*;
+    use simple_logger::*;
+    let _ = SimpleLogger::new()
+        .with_level(LevelFilter::Debug)
+        .with_module_level("j4rs", LevelFilter::Warn)
+        .with_module_level("reqwest", LevelFilter::Warn)
+        .with_module_level("hyper", LevelFilter::Warn)
+        .with_module_level("serde_xml_rs", LevelFilter::Warn)
+        .with_module_level("rustls", LevelFilter::Warn)
+        .init();
     dotenv().ok();
 }
 

tmc-langs-framework/Cargo.toml

@@ -23,7 +23,6 @@ tempfile = "3"
 anyhow = "1"
 
 [dev-dependencies]
-env_logger = "0.8"
 tempfile = "3"
 mockall = "0.8"
 simple_logger = "1"

tmc-langs-framework/src/command.rs

@@ -111,20 +111,29 @@ impl TmcCommand {
         let stdout = read_output(stdout, popen.stdout.as_mut())?;
         let stderr = read_output(stderr, popen.stderr.as_mut())?;
 
-        // if checked is set, error with failed exit status
-        if checked && !exit_status.success() {
-            log::warn!("stdout: {}", String::from_utf8_lossy(&stdout));
-            log::warn!("stderr: {}", String::from_utf8_lossy(&stderr));
-            return Err(CommandError::Failed {
-                command: cmd,
-                status: exit_status,
-                stdout: String::from_utf8_lossy(&stdout).into_owned(),
-                stderr: String::from_utf8_lossy(&stderr).into_owned(),
+        // on success, log stdout trace and stderr debug
+        // on failure if checked, log warn
+        // on failure if not checked, log debug
+        if !exit_status.success() {
+            // if checked is set, error with failed exit status
+            if checked {
+                log::warn!("stdout: {}", String::from_utf8_lossy(&stdout));
+                log::warn!("stderr: {}", String::from_utf8_lossy(&stderr));
+                return Err(CommandError::Failed {
+                    command: cmd,
+                    status: exit_status,
+                    stdout: String::from_utf8_lossy(&stdout).into_owned(),
+                    stderr: String::from_utf8_lossy(&stderr).into_owned(),
+                }
+                .into());
+            } else {
+                log::debug!("stdout: {}", String::from_utf8_lossy(&stdout));
+                log::debug!("stderr: {}", String::from_utf8_lossy(&stderr));
             }
-            .into());
+        } else {
+            log::trace!("stdout: {}", String::from_utf8_lossy(&stdout));
+            log::debug!("stderr: {}", String::from_utf8_lossy(&stderr));
         }
-        log::trace!("stdout: {}", String::from_utf8_lossy(&stdout));
-        log::debug!("stderr: {}", String::from_utf8_lossy(&stderr));
         Ok(Output {
             status: exit_status,
             stdout,

tmc-langs-framework/src/meta_syntax.rs

@@ -195,7 +195,9 @@ mod test {
     use super::*;
 
     fn init() {
-        let _ = env_logger::builder().is_test(true).try_init();
+        use log::*;
+        use simple_logger::*;
+        let _ = SimpleLogger::new().with_level(LevelFilter::Debug).init();
     }
 
     impl MetaString {