notedeck

commit 050c6e39de42afcdd37751f5610b3ab923f5250b
parent 503b7edeb555496c02b0bd41b7c5a90c034f96ee
Author: Ken Sedgwick <ken@bonsai.com>
Date:   Thu,  7 Nov 2024 14:35:12 -0600

Merge pull request #389 from ksedgwic/2024-10-fix-rust-log-env

Restore RUST_LOG filtering, default to INFO if absent
Diffstat:
M
Cargo.lock
 | 
34
+++++++++++++++++++++++++++++++---
M
Cargo.toml
 | 
2
+-
M
src/bin/notedeck.rs
 | 
13
++++++++-----

3 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -2328,6 +2328,15 @@ dependencies = [
 ]
 
 [[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 = "maybe-rayon"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3472,8 +3481,17 @@ checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.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]]
@@ -3484,11 +3502,17 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.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.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
@@ -4552,10 +4576,14 @@ version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
+ "matchers",
  "nu-ansi-term",
+ "once_cell",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
  "tracing-log",
 ]
diff --git a/Cargo.toml b/Cargo.toml
@@ -76,7 +76,7 @@ wasm-bindgen-futures = "0.4"
 # native:
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio = { version = "1.16", features = ["macros", "rt-multi-thread", "fs"] }
-tracing-subscriber = "0.3"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 
 [target.'cfg(target_os = "android")'.dependencies]
diff --git a/src/bin/notedeck.rs b/src/bin/notedeck.rs
@@ -2,6 +2,7 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
 use notedeck::app_creation::generate_native_options;
 use notedeck::Damus;
+use tracing_subscriber::EnvFilter;
 
 // Entry point for wasm
 //#[cfg(target_arch = "wasm32")]
@@ -41,7 +42,6 @@ async fn main() {
 
     // Log to stdout (if you run with `RUST_LOG=debug`).
     if let Some(non_blocking_writer) = maybe_non_blocking {
-        use tracing::Level;
         use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt};
 
         let console_layer = fmt::layer().with_target(true).with_writer(std::io::stdout);
@@ -51,16 +51,19 @@ async fn main() {
             .with_ansi(false)
             .with_writer(non_blocking_writer);
 
+        let env_filter =
+            EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+
         // Set up the subscriber to combine both layers
         tracing_subscriber::registry()
             .with(console_layer)
             .with(file_layer)
-            .with(tracing_subscriber::filter::LevelFilter::from_level(
-                Level::INFO,
-            )) // Set log level
+            .with(env_filter)
             .init();
     } else {
-        tracing_subscriber::fmt::init();
+        tracing_subscriber::fmt()
+            .with_env_filter(EnvFilter::from_default_env())
+            .init();
     }
 
     let _res = eframe::run_native(