diff --git a/Cargo.lock b/Cargo.lock index f0cb05c71..e32aa954c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2062,7 +2062,6 @@ dependencies = [ "toml_edit 0.21.1", "tower", "tower-http", - "tracing-subscriber", "walkdir", "wasm-bindgen-cli-support", "zip", diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 240e8ee0c..e10d2c270 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -94,7 +94,6 @@ interprocess = { workspace = true } # interprocess-docfix = { version = "1.2.2" } ignore = "0.4.22" env_logger = "0.11.3" -tracing-subscriber = "0.3.18" [features] default = [] diff --git a/packages/cli/src/lib.rs b/packages/cli/src/lib.rs index 37d234aa8..5c904d7ba 100644 --- a/packages/cli/src/lib.rs +++ b/packages/cli/src/lib.rs @@ -15,5 +15,8 @@ pub use cli::*; pub mod error; pub use error::*; +pub mod logging; +pub use logging::*; + #[cfg(feature = "plugin")] pub mod plugin; diff --git a/packages/cli/src/logging.rs b/packages/cli/src/logging.rs new file mode 100644 index 000000000..0d902f86f --- /dev/null +++ b/packages/cli/src/logging.rs @@ -0,0 +1,46 @@ +use fern::colors::{Color, ColoredLevelConfig}; + +pub fn set_up_logging() { + // configure colors for the whole line + let colors_line = ColoredLevelConfig::new() + .error(Color::Red) + .warn(Color::Yellow) + // we actually don't need to specify the color for debug and info, they are white by default + .info(Color::White) + .debug(Color::White) + // depending on the terminals color scheme, this is the same as the background color + .trace(Color::BrightBlack); + + // configure colors for the name of the level. + // since almost all of them are the same as the color for the whole line, we + // just clone `colors_line` and overwrite our changes + let colors_level = colors_line.info(Color::Green); + // here we set up our fern Dispatch + fern::Dispatch::new() + .format(move |out, message, record| { + out.finish(format_args!( + "{color_line}[{level}{color_line}] {message}\x1B[0m", + color_line = format_args!( + "\x1B[{}m", + colors_line.get_color(&record.level()).to_fg_str() + ), + level = colors_level.color(record.level()), + )); + }) + .level(match std::env::var("DIOXUS_LOG") { + Ok(level) => match level.to_lowercase().as_str() { + "error" => log::LevelFilter::Error, + "warn" => log::LevelFilter::Warn, + "info" => log::LevelFilter::Info, + "debug" => log::LevelFilter::Debug, + "trace" => log::LevelFilter::Trace, + _ => { + panic!("Invalid log level: {}", level) + } + }, + Err(_) => log::LevelFilter::Info, + }) + .chain(std::io::stdout()) + .apply() + .unwrap(); +} diff --git a/packages/cli/src/main.rs b/packages/cli/src/main.rs index 07b2609bf..4943e6e3b 100644 --- a/packages/cli/src/main.rs +++ b/packages/cli/src/main.rs @@ -11,7 +11,10 @@ use Commands::*; async fn main() -> anyhow::Result<()> { let args = Cli::parse(); - tracing_subscriber::fmt::init(); + #[cfg(debug_assertions)] + env_logger::init(); + + // set_up_logging(); match args.action { Translate(opts) => opts