Kaynağa Gözat

switch to tracing

Evan Almloff 1 yıl önce
ebeveyn
işleme
6608f73a2e

+ 1 - 0
Cargo.lock

@@ -2062,6 +2062,7 @@ dependencies = [
  "toml_edit 0.21.1",
  "tower",
  "tower-http",
+ "tracing-subscriber",
  "walkdir",
  "wasm-bindgen-cli-support",
  "zip",

+ 1 - 0
packages/cli/Cargo.toml

@@ -94,6 +94,7 @@ 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 = []

+ 0 - 3
packages/cli/src/lib.rs

@@ -15,8 +15,5 @@ pub use cli::*;
 pub mod error;
 pub use error::*;
 
-pub mod logging;
-pub use logging::*;
-
 #[cfg(feature = "plugin")]
 pub mod plugin;

+ 0 - 46
packages/cli/src/logging.rs

@@ -1,46 +0,0 @@
-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();
-}

+ 1 - 4
packages/cli/src/main.rs

@@ -11,10 +11,7 @@ use Commands::*;
 async fn main() -> anyhow::Result<()> {
     let args = Cli::parse();
 
-    #[cfg(debug_assertions)]
-    env_logger::init();
-
-    // set_up_logging();
+    tracing_subscriber::fmt::init();
 
     match args.action {
         Translate(opts) => opts