The daemon now uses the log crate

Author: ShellCode33

backlightd/Cargo.toml

@@ -4,6 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+log = "0.4.22"
+pretty_env_logger = "0.5.0"
 ddc-hi = "0.4.1"
 backlight_ipc = { path = "../backlight_ipc" }
 anyhow = "1.0.93"

backlightd/src/auto.rs

@@ -7,6 +7,7 @@ use std::{
 use anyhow::anyhow;
 use backlight_ipc::BacklightMode;
 use chrono::{DateTime, Datelike, Local, NaiveTime};
+use log::{error, info};
 use sunrise::sunrise_sunset;
 
 use crate::{location::find_location, monitors};
@@ -32,14 +33,14 @@ pub fn auto_adjust(auto_adjust_receiver: Receiver<BacklightMode>) -> ! {
             };
 
             if let Err(err) = result {
-                eprintln!("Unable to set brightness: {err}");
+                error!("Unable to set brightness: {err}");
             }
         }
 
         match auto_adjust_receiver.recv_timeout(AUTO_ADJUST_INTERVAL) {
             Ok(new_mode) => {
                 if new_mode != current_mode {
-                    println!("Set backlightd mode to {new_mode:?}");
+                    info!("Set backlightd mode to {new_mode:?}");
                 }
                 last_time_mode_was_changed = Instant::now();
                 current_mode = new_mode;

backlightd/src/main.rs

@@ -10,6 +10,7 @@ use std::{
 
 use auto::auto_adjust;
 use backlight_ipc::{BacklightCommand, BacklightMode, DEFAULT_UNIX_SOCKET_PATH};
+use log::error;
 use monitors::auto_refresh_monitors_list;
 
 mod acpi;
@@ -53,19 +54,24 @@ fn handle_commands(
                 auto_adjust_sender
                     .send(backlight_mode)
                     .unwrap_or_else(|err| {
-                        eprintln!("Failed to send mode to auto adjust channel: {err}")
+                        error!("Failed to send mode to auto adjust channel: {err}")
                     });
                 Ok(())
             }
         };
 
         if let Err(err) = result {
-            eprintln!("Command handling failed: {err}");
+            error!("Command handling failed: {err}");
         }
     }
 }
 
 fn main() {
+    pretty_env_logger::formatted_builder()
+        .filter_level(log::LevelFilter::Info)
+        .parse_env("BACKLIGHTD_LOG_LEVEL")
+        .init();
+
     let args: Vec<String> = env::args().collect();
 
     if args.len() != 1 && args.len() != 3 {
@@ -84,15 +90,15 @@ fn main() {
 
     if let Err(err) = remove_file(unix_socket_path) {
         if !matches!(err.kind(), io::ErrorKind::NotFound) {
-            eprintln!("{unix_socket_path}: {err}");
+            error!("{unix_socket_path}: {err}");
             exit(1);
         }
     }
 
     let listener = match UnixListener::bind(unix_socket_path) {
         Ok(listener) => listener,
         Err(err) => {
-            eprintln!("{unix_socket_path}: {err}");
+            error!("{unix_socket_path}: {err}");
             exit(1);
         }
     };
@@ -120,7 +126,7 @@ fn main() {
         let stream = match stream {
             Ok(stream) => stream,
             Err(err) => {
-                eprintln!("A client tried to connect but something wrong happened: {err}");
+                error!("A client tried to connect but something wrong happened: {err}");
                 continue;
             }
         };
@@ -130,7 +136,7 @@ fn main() {
                 cmd_sender.send(command).unwrap();
             }
             Err(err) => {
-                eprintln!("Unable to deserialize command: {err}");
+                error!("Unable to deserialize command: {err}");
             }
         }
     }

backlightd/src/monitors.rs

@@ -5,6 +5,8 @@ use std::{
     time::{Duration, Instant},
 };
 
+use log::{error, info};
+
 use crate::acpi::{BacklightAcpiDevice, ACPI_DEVICES_PATH};
 use crate::ddc::BacklightDdcDevice;
 
@@ -52,7 +54,7 @@ pub(crate) fn refresh_monitors_list() {
     for ddc_device in ddc_hi::Display::enumerate() {
         match BacklightDdcDevice::new(ddc_device) {
             Ok(monitor) => new_monitors.push(Box::new(monitor)),
-            Err(err) => eprintln!("Failed to retrieve DDC backlight monitor: {err}"),
+            Err(err) => error!("Failed to retrieve DDC backlight monitor: {err}"),
         }
     }
 
@@ -62,16 +64,16 @@ pub(crate) fn refresh_monitors_list() {
                 match entry {
                     Ok(file) => match BacklightAcpiDevice::new(file.path()) {
                         Ok(monitor) => new_monitors.push(Box::new(monitor)),
-                        Err(err) => println!("Failed to retrieve ACPI backlight monitor: {err}"),
+                        Err(err) => error!("Failed to retrieve ACPI backlight monitor: {err}"),
                     },
                     Err(err) => {
-                        eprintln!("Unable to read entry from {ACPI_DEVICES_PATH}: {err}");
+                        error!("Unable to read entry from {ACPI_DEVICES_PATH}: {err}");
                     }
                 }
             }
         }
         Err(err) => {
-            eprintln!("{ACPI_DEVICES_PATH}: {err}");
+            error!("{ACPI_DEVICES_PATH}: {err}");
             // fallthrough
         }
     }
@@ -89,6 +91,7 @@ pub(crate) fn set_brightness_percent(percent: u8) -> anyhow::Result<()> {
     for monitor in MONITORS.lock().unwrap().iter_mut() {
         monitor.set_brightness(percent)?;
     }
+    info!("Brightness of all monitors has been set to {percent}%");
     Ok(())
 }