src: logger: Change parameter to be log_include_all_dependencies, def…

…ault log ping-viewer-next and current application
bluerobotics · Sep 11, 2024 · 6cca42c · 6cca42c
1 parent 6f9dcc4
commit 6cca42c
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/logger/manager.rs b/src/logger/manager.rs
@@ -59,33 +59,35 @@ pub fn init() {
     // Configure the default subscriber
     match (
         cli::manager::is_tracy(),
-        cli::manager::log_current_crate_only(),
+        cli::manager::is_log_all_dependencies(),
     ) {
-        (true, true) => {
+        (true, false) => {
+            let lib_name = env!("CARGO_PKG_NAME").replace('-', "_");
             let subscriber = subscriber.with(EnvFilter::new(format!(
-                "{}={level}",
-                env!("CARGO_PKG_NAME").replace('-', "_")
+                "{lib_name}={level},lib{lib_name}={level}"
             )));
             let tracy_layer = tracing_tracy::TracyLayer::default();
             let subscriber = subscriber.with(tracy_layer);
             tracing::subscriber::set_global_default(subscriber)
                 .expect("Unable to set a global subscriber");
         }
-        (false, true) => {
+        (false, false) => {
+            let lib_name = env!("CARGO_PKG_NAME").replace('-', "_");
             let subscriber = subscriber.with(EnvFilter::new(format!(
-                "{}={level}",
-                env!("CARGO_PKG_NAME").replace('-', "_")
+                "{lib_name}={level},lib{lib_name}={level}"
             )));
             tracing::subscriber::set_global_default(subscriber)
                 .expect("Unable to set a global subscriber");
         }
-        (true, false) => {
+        (true, true) => {
+            let subscriber = subscriber.with(EnvFilter::new(level.to_string()));
             let tracy_layer = tracing_tracy::TracyLayer::default();
             let subscriber = subscriber.with(tracy_layer);
             tracing::subscriber::set_global_default(subscriber)
                 .expect("Unable to set a global subscriber");
         }
-        (false, false) => {
+        (false, true) => {
+            let subscriber = subscriber.with(EnvFilter::new(level.to_string()));
             tracing::subscriber::set_global_default(subscriber)
                 .expect("Unable to set a global subscriber");
         }