Switch to debug! macro for quieter logs by default

Author: zachfeldman

Cargo.lock

@@ -6,6 +6,8 @@ version = "0.0.1"
 [dependencies]
 dbus = { version = "0.9.7", features = ["vendored"] }
 clap = { version = "4.0", features = ["derive"] }
+log = "0.4"
+env_logger = "0.10.0"
 
 [dependencies.libdbus-sys]
 default-features = false

dbus-monitor/Cargo.toml

@@ -19,26 +19,26 @@ use inputmodule_control::commands::ClapCli;
 use inputmodule_control::inputmodule::{serial_commands};
 use clap::{Parser, Subcommand};
 
+use log::debug;
+
 fn handle_message(msg: &Message) {
-    println!("Got message from DBus: {:?}", msg);
+    debug!("Got message from DBus: {:?}", msg);
+
     let mut iter = msg.iter_init();
     while let Some(arg) = iter.get_refarg() {
-        // Extract the inner value as a string and convert it to a String
         if let Some(string_ref) = arg.as_str() {
             let string_value: String = string_ref.to_string();
-            println!("String value: {}", string_value);
+            debug!("String value: {}", string_value);
 
             if string_value.contains("calendar.google.com"){
                 run_inputmodule_command(vec!["led-matrix", "--pattern", "all-on", "--blink-n-times", "3"]);
                 run_inputmodule_command(vec!["led-matrix", "--brightness", "0"]);
             }
-        } else {
-            println!("Not a string.");
         }
         iter.next();
     }
 
-    println!("Message handled");
+    debug!("DBus Message handled");
 }
 
 pub fn run_inputmodule_command(args: Vec<&str>){
@@ -52,7 +52,7 @@ pub fn run_inputmodule_command(args: Vec<&str>){
 pub fn run_dbus_monitor() {
     // First open up a connection to the desired bus.
     let conn = Connection::new_session().expect("D-Bus connection failed");
-    println!("Connection to DBus session monitor opened");
+    debug!("Connection to DBus session monitor opened");
 
     // Second create a rule to match messages we want to receive; in this example we add no
     // further requirements, so all messages will match
@@ -72,23 +72,23 @@ pub fn run_dbus_monitor() {
         "BecomeMonitor",
         (vec![rule.match_str()], 0u32),
     );
-    println!("Monitoring DBus channel...");
+    debug!("Monitoring DBus channel...");
 
     match result {
         // BecomeMonitor was successful, start listening for messages
         Ok(_) => {
             conn.start_receive(
                 rule,
                 Box::new(|msg, _| {
-                    println!("Start listening");
+                    debug!("Start listening");
                     handle_message(&msg);
                     true
                 }),
             );
         }
         // BecomeMonitor failed, fallback to using the old scheme
         Err(e) => {
-            eprintln!(
+            debug!(
                 "Failed to BecomeMonitor: '{}', falling back to eavesdrop",
                 e
             );
@@ -113,7 +113,7 @@ pub fn run_dbus_monitor() {
                 // This can sometimes fail, for example when listening to the system bus as a non-root user.
                 // So, just like `dbus-monitor`, we attempt to fallback without `eavesdrop=true`:
                 Err(e) => {
-                    eprintln!("Failed to eavesdrop: '{}', trying without it", e);
+                    debug!("Failed to eavesdrop: '{}', trying without it", e);
                     conn.add_match(rule, |_: (), _, msg| {
                         handle_message(&msg);
                         true

dbus-monitor/src/dbus_monitor.rs

@@ -1,6 +1,11 @@
 mod dbus_monitor;
 mod utils;
 
+extern crate log;
+use log::{debug};
+use env_logger;
+
 fn main() {
+    env_logger::init();
     dbus_monitor::run_dbus_monitor();
 }