feat: use env_logger

Instead of the custom logger impl, which limits the features we can
easily provide for users.

This introduces the `BCACHEFS_LOG` environment variable for setting the
log verbosity. Setting `BCACHEFS_LOG=trace`, e.g. in a test environment,
will yield all log messages.

Also I think it's reasonable to print INFO level logs by default.

Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>

6 files changed, 45 insertions, 46 deletions

diff --git a/src/bcachefs.rs b/src/bcachefs.rs
index e5776ec0..643ac048 100644
--- a/src/bcachefs.rs
+++ b/src/bcachefs.rs
@@ -1,11 +1,11 @@
 mod commands;
 mod key;
+mod logging;
 mod wrappers;
 
 use std::ffi::{c_char, CString};
 
 use bch_bindgen::c;
-use commands::logger::SimpleLogger;
 
 #[derive(Debug)]
 pub struct ErrnoError(pub errno::Errno);
@@ -94,9 +94,6 @@ fn main() {
 
     unsafe { c::raid_init() };
 
-    log::set_boxed_logger(Box::new(SimpleLogger)).unwrap();
-    log::set_max_level(log::LevelFilter::Warn);
-
     let cmd = match symlink_cmd {
         Some(s) => s,
         None => args[1].as_str(),
diff --git a/src/commands/list.rs b/src/commands/list.rs
index 77f53b4f..36093909 100644
--- a/src/commands/list.rs
+++ b/src/commands/list.rs
@@ -10,6 +10,8 @@ use clap::Parser;
 use log::error;
 use std::io::{stdout, IsTerminal};
 
+use crate::logging;
+
 fn list_keys(fs: &Fs, opt: &Cli) -> anyhow::Result<()> {
     let trans = BtreeTrans::new(fs);
     let mut iter = BtreeIter::new(
@@ -145,13 +147,14 @@ pub struct Cli {
     #[arg(short, long)]
     fsck: bool,
 
+    // FIXME: would be nicer to have `--color[=WHEN]` like diff or ls?
     /// Force color on/off. Default: autodetect tty
     #[arg(short, long, action = clap::ArgAction::Set, default_value_t=stdout().is_terminal())]
     colorize: bool,
 
     /// Verbose mode
-    #[arg(short, long)]
-    verbose: bool,
+    #[arg(short, long, action = clap::ArgAction::Count)]
+    verbose: u8,
 
     #[arg(required(true))]
     devices: Vec<std::path::PathBuf>,
@@ -180,7 +183,7 @@ fn cmd_list_inner(opt: &Cli) -> anyhow::Result<()> {
         opt_set!(fs_opts, norecovery, 0);
     }
 
-    if opt.verbose {
+    if opt.verbose > 0 {
         opt_set!(fs_opts, verbose, 1);
     }
 
@@ -196,7 +199,10 @@ fn cmd_list_inner(opt: &Cli) -> anyhow::Result<()> {
 
 pub fn list(argv: Vec<String>) -> i32 {
     let opt = Cli::parse_from(argv);
-    colored::control::set_override(opt.colorize);
+
+    // TODO: centralize this on the top level CLI
+    logging::setup(false, opt.verbose, opt.colorize);
+
     if let Err(e) = cmd_list_inner(&opt) {
         error!("Fatal error: {}", e);
         1
diff --git a/src/commands/logger.rs b/src/commands/logger.rs
deleted file mode 100644
index a24bcbda..00000000
--- a/src/commands/logger.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use colored::Colorize;
-use log::{Level, Metadata, Record};
-
-pub struct SimpleLogger;
-
-impl log::Log for SimpleLogger {
-    fn enabled(&self, _: &Metadata) -> bool {
-        true
-    }
-
-    fn log(&self, record: &Record) {
-        let debug_prefix = match record.level() {
-            Level::Error => "ERROR".bright_red(),
-            Level::Warn => "WARN".bright_yellow(),
-            Level::Info => "INFO".green(),
-            Level::Debug => "DEBUG".bright_blue(),
-            Level::Trace => "TRACE".into(),
-        };
-        eprintln!(
-            "{} - {}: {}",
-            debug_prefix,
-            record.module_path().unwrap_or_default().bright_black(),
-            record.args()
-        );
-    }
-
-    fn flush(&self) {}
-}
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index e873a46d..7f466f92 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -2,7 +2,6 @@ use clap::Subcommand;
 
 pub mod completions;
 pub mod list;
-pub mod logger;
 pub mod mount;
 pub mod subvolume;
 
diff --git a/src/commands/mount.rs b/src/commands/mount.rs
index 18b4aae5..bdbbfab9 100644
--- a/src/commands/mount.rs
+++ b/src/commands/mount.rs
@@ -11,10 +11,13 @@ use std::{
 use anyhow::{ensure, Result};
 use bch_bindgen::{bcachefs, bcachefs::bch_sb_handle, opt_set, path_to_cstr};
 use clap::Parser;
-use log::{debug, error, info, LevelFilter};
+use log::{debug, error, info};
 use uuid::Uuid;
 
-use crate::key::{KeyHandle, Passphrase, UnlockPolicy};
+use crate::{
+    key::{KeyHandle, Passphrase, UnlockPolicy},
+    logging,
+};
 
 fn mount_inner(
     src: String,
@@ -242,6 +245,7 @@ pub struct Cli {
     #[arg(short, default_value = "")]
     options: String,
 
+    // FIXME: would be nicer to have `--color[=WHEN]` like diff or ls?
     /// Force color on/off. Autodetect tty is used to define default:
     #[arg(short, long, action = clap::ArgAction::Set, default_value_t=stdout().is_terminal())]
     colorize: bool,
@@ -374,14 +378,9 @@ pub fn mount(mut argv: Vec<String>, symlink_cmd: Option<&str>) -> i32 {
 
     let cli = Cli::parse_from(argv);
 
-    // @TODO : more granular log levels via mount option
-    log::set_max_level(match cli.verbose {
-        0 => LevelFilter::Warn,
-        1 => LevelFilter::Trace,
-        2_u8..=u8::MAX => todo!(),
-    });
+    // TODO: centralize this on the top level CLI
+    logging::setup(false, cli.verbose, cli.colorize);
 
-    colored::control::set_override(cli.colorize);
     if let Err(e) = cmd_mount_inner(&cli) {
         error!("Fatal error: {}", e);
         1
diff --git a/src/logging.rs b/src/logging.rs
new file mode 100644
index 00000000..dee99881
--- /dev/null
+++ b/src/logging.rs
@@ -0,0 +1,26 @@
+use env_logger::WriteStyle;
+use log::LevelFilter;
+
+pub fn setup(quiet: bool, verbose: u8, color: bool) {
+    let level_filter = if quiet {
+        LevelFilter::Off
+    } else {
+        match verbose {
+            0 => LevelFilter::Info,
+            1 => LevelFilter::Debug,
+            _ => LevelFilter::Trace,
+        }
+    };
+
+    let style = if color {
+        WriteStyle::Always
+    } else {
+        WriteStyle::Never
+    };
+
+    env_logger::Builder::new()
+        .filter_level(level_filter)
+        .write_style(style)
+        .parse_env("BCACHEFS_LOG")
+        .init();
+}