Browse Source

main: Use tracing-subscriber's EnvFilter

It is more powerful than the default filter.
This syntax also allows to add other layers.
merge-requests/1461/head
Kévin Commaille 3 years ago
parent
commit
be5e2784e5
No known key found for this signature in database
GPG Key ID: 29A48C1F03620416
  1. 34
      Cargo.lock
  2. 2
      Cargo.toml
  3. 7
      src/main.rs

34
Cargo.lock generated

@ -2923,6 +2923,15 @@ dependencies = [
"xml5ever",
]
[[package]]
name = "matchers"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
dependencies = [
"regex-automata 0.1.10",
]
[[package]]
name = "matrix-pickle"
version = "0.1.0"
@ -4144,8 +4153,17 @@ checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata",
"regex-syntax",
"regex-automata 0.3.6",
"regex-syntax 0.7.4",
]
[[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]]
@ -4156,9 +4174,15 @@ checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
"regex-syntax 0.7.4",
]
[[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.4"
@ -5130,10 +5154,14 @@ 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",
]

2
Cargo.toml

@ -63,7 +63,7 @@ strum = { version = "0.24", features = ["derive"] }
thiserror = "1"
tokio = { version = "1", features = ["rt", "rt-multi-thread", "sync"] }
tracing = "0.1"
tracing-subscriber = "0.3"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
url = "2"
[dependencies.adw]

7
src/main.rs

@ -25,6 +25,7 @@ mod window;
use gettextrs::*;
use gtk::{gdk::Display, gio, IconTheme};
use once_cell::sync::Lazy;
use tracing_subscriber::{fmt, prelude::*, EnvFilter};
use self::{application::*, config::*, i18n::*, window::Window};
@ -33,8 +34,10 @@ pub static RUNTIME: Lazy<tokio::runtime::Runtime> =
Lazy::new(|| tokio::runtime::Runtime::new().unwrap());
fn main() {
// Initialize logger, debug is carried out via debug!, info!, and warn!.
tracing_subscriber::fmt::init();
// Initialize logger, debug is carried out via debug!, info!, warn! and error!.
tracing_subscriber::registry()
.with(fmt::layer().with_filter(EnvFilter::from_default_env()))
.init();
// Prepare i18n
setlocale(LocaleCategory::LcAll, "");

Loading…
Cancel
Save