WIP switch to simplelog

`env_logger` does not handle writing to file for the moment, see rust-cli/env_logger#208
kraktus · Oct 26, 2022 · 7325e03 · 7325e03
1 parent 1720b5b
commit 7325e03
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/lintcheck/Cargo.toml b/lintcheck/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 cargo_metadata = "0.14"
 clap = "3.2"
 crossbeam-channel = "0.5.6"
-env_logger = "0.9"
+simplelog = "0.12.0"
 flate2 = "1.0"
 log = "0.4"
 rayon = "1.5.1"

diff --git a/lintcheck/src/config.rs b/lintcheck/src/config.rs
@@ -1,7 +1,8 @@
 use clap::{Arg, ArgAction, ArgMatches, Command};
-use env_logger::Builder;
 use log::LevelFilter;
+use simplelog::{ColorChoice, CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger};
 use std::env;
+use std::fs::{self, File};
 use std::path::PathBuf;
 
 fn get_clap_config() -> ArgMatches {
@@ -58,6 +59,8 @@ pub(crate) struct LintcheckConfig {
     pub sources_toml_path: PathBuf,
     /// we save the clippy lint results here
     pub lintcheck_results_path: PathBuf,
+    // /// we save the clippy logs here
+    // pub lintcheck_log_path: PathBuf,
     /// Check only a specified package
     pub only: Option<String>,
     /// whether to just run --fix and not collect all the warnings
@@ -73,22 +76,24 @@ pub(crate) struct LintcheckConfig {
 impl LintcheckConfig {
     pub fn new() -> Self {
         let clap_config = get_clap_config();
-        let mut builder = Builder::new();
-        builder
-            .filter(
-                None,
-                match clap_config.get_count("verbose") {
-                    0 => LevelFilter::Warn,
-                    1 => LevelFilter::Info,
-                    2 => dbg!(LevelFilter::Debug),
-                    _ => LevelFilter::Trace,
-                },
-            )
-            .default_format()
-            .init();
-        assert_eq!(clap_config.get_count("verbose"), 2);
+        let level_filter = match clap_config.get_count("verbose") {
+            0 => LevelFilter::Warn,
+            1 => LevelFilter::Info,
+            2 => dbg!(LevelFilter::Debug),
+            _ => LevelFilter::Trace,
+        };
+        // creating the dir that will contain the log and results
+        fs::create_dir("lintcheck-logs").expect("Creating the log dir failed");
+        let _ = CombinedLogger::init(vec![
+            TermLogger::new(level_filter, Config::default(), TerminalMode::Mixed, ColorChoice::Auto),
+            WriteLogger::new(
+                level_filter,
+                Config::default(),
+                File::create("lintcheck-logs/lintcheck.log").unwrap(),
+            ),
+        ]);
+        // assert_eq!(clap_config.get_count("verbose"), 2);
         log::debug!("Test");
-        println!("{:?}", builder);
 
         // first, check if we got anything passed via the LINTCHECK_TOML env var,
         // if not, ask clap if we got any value for --crates-toml  <foo>

diff --git a/lintcheck/src/main.rs b/lintcheck/src/main.rs
@@ -693,7 +693,6 @@ fn main() {
     }
 
     println!("Writing logs to {}", config.lintcheck_results_path.display());
-    fs::create_dir_all(config.lintcheck_results_path.parent().unwrap()).unwrap();
     fs::write(&config.lintcheck_results_path, text).unwrap();
 
     print_stats(old_stats, new_stats, &config.lint_filter);