From 18527db7072b890c5322540ed5a915b7e98daa5c Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Tue, 30 May 2023 21:51:23 +0200 Subject: [PATCH] chore: switch to tracing --- Cargo.lock | 95 +++++++++++++++++++++++++++++++------------------ app/Cargo.toml | 4 +-- app/src/main.rs | 22 ++++++++---- 3 files changed, 78 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77b2ef8..2f491de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -801,18 +801,18 @@ dependencies = [ "derive_setters", "dirs 5.0.1", "downcast-rs", - "env_logger", "generator", "i18n-embed", "i18n-embed-fl", "libcosmic", - "log", "once_cell", "regex", "rkyv", "rust-embed", "slotmap", "tokio", + "tracing", + "tracing-subscriber", ] [[package]] @@ -1311,19 +1311,6 @@ dependencies = [ "syn 2.0.18", ] -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "errno" version = "0.3.1" @@ -1997,12 +1984,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "i18n-config" version = "0.4.4" @@ -2445,18 +2426,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2666,6 +2635,15 @@ dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + [[package]] name = "memchr" version = "2.5.0" @@ -2941,6 +2919,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num" version = "0.4.0" @@ -3175,6 +3163,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "owo-colors" version = "3.5.0" @@ -3621,9 +3615,24 @@ checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.2", ] +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.7.2" @@ -4537,15 +4546,33 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", "sharded-slab", + "smallvec", "thread_local", + "tracing", "tracing-core", + "tracing-log", ] [[package]] diff --git a/app/Cargo.toml b/app/Cargo.toml index 9054c4a..9b294fe 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -25,9 +25,9 @@ rust-embed = "6.6.1" slotmap = "1.0.6" tokio = "1.28.2" downcast-rs = "1.2.0" -log = "0.4" -env_logger = "0.10" cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel" } +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.17", features = ["env-filter"]} [dependencies.i18n-embed] version = "0.13.9" diff --git a/app/src/main.rs b/app/src/main.rs index 39cd94b..5a03b21 100644 --- a/app/src/main.rs +++ b/app/src/main.rs @@ -18,8 +18,6 @@ pub mod widget; pub mod pages; -use env_logger::Env; - use cosmic::{ iced::{wayland::actions::window::SctkWindowSettings, Application, Limits}, iced_sctk::settings::InitialSurface, @@ -30,17 +28,27 @@ use i18n_embed::DesktopLanguageRequester; /// /// Returns error if iced fails to run the application. pub fn main() -> color_eyre::Result<()> { - let env = Env::default() - .filter_or("MY_LOG_LEVEL", "info") - .write_style_or("MY_LOG_STYLE", "always"); - - env_logger::init_from_env(env); color_eyre::install()?; if std::env::var("RUST_SPANTRACE").is_err() { std::env::set_var("RUST_SPANTRACE", "0"); } + if std::env::var_os("RUST_LOG").is_none() { + std::env::set_var("RUST_LOG", "info"); + } + + tracing_subscriber::fmt() + .pretty() + .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) + .with_writer(std::io::stderr) + .without_time() + .with_line_number(true) + .with_file(true) + .with_target(false) + .with_thread_names(true) + .init(); + let localizer = crate::localize::localizer(); let requested_languages = DesktopLanguageRequester::requested_languages();