logs: fix log levels and default log level, and adjust readme to reflect

Author: RGBCube

README.md

@@ -75,8 +75,16 @@ daemons.
 # Run as a daemon in the background with default configuration
 sudo watt
 
-# Run with verbose logging
-sudo watt --verbose # or --quiet for decreased verbosity
+# Run with adjusted logging
+#
+# You can also use the logform options
+# --quiet and --verbose, and repeat them.
+sudo watt -qqq # Log level: OFF   (won't log)
+sudo watt -qq  # Log level: ERROR (will log only ERROR)
+sudo watt -q   # Log level: WARN  (will log ERROR and up)
+sudo watt      # Log level: INFO  (will log INFO and up)
+sudo watt -v   # Log level: DEBUG (will log DEBUG and up)
+sudo watt -vv  # Log level: TRACE (will log everything)
 
 # Run with a custom configuration file
 sudo watt --config /path/to/config.toml

watt/config.rs

@@ -527,16 +527,13 @@ impl DaemonConfig {
 
   pub fn load_from(path: Option<&Path>) -> anyhow::Result<Self> {
     let contents = if let Some(path) = path {
-      log::debug!("loading config from '{path}'", path = path.display());
+      log::info!("loading config from '{path}'", path = path.display());
 
       &fs::read_to_string(path).with_context(|| {
         format!("failed to read config from '{path}'", path = path.display())
       })?
     } else {
-      log::debug!(
-        "loading default config from embedded toml:\n{config}",
-        config = Self::DEFAULT,
-      );
+      log::info!("loading default config");
 
       Self::DEFAULT
     };

watt/daemon.rs

@@ -70,7 +70,7 @@ impl Daemon {
   fn rescan(&mut self) -> anyhow::Result<()> {
     self.system.rescan()?;
 
-    log::debug!("appending daemon logs...");
+    log::debug!("appending to daemon logs...");
 
     let at = Instant::now();
 
@@ -372,7 +372,7 @@ pub fn run(config: config::DaemonConfig) -> anyhow::Result<()> {
       minutes = delay.as_secs_f64() / 60.0,
     );
 
-    log::debug!("filtering rules and applying them...");
+    log::info!("filtering rules and applying them...");
 
     let start = Instant::now();
 

watt/lib.rs

@@ -25,7 +25,7 @@ pub enum Command {
   /// Watt daemon.
   Watt {
     #[command(flatten)]
-    verbosity: clap_verbosity_flag::Verbosity,
+    verbosity: clap_verbosity_flag::Verbosity<clap_verbosity_flag::InfoLevel>,
 
     #[clap(flatten)]
     command: WattCommand,
@@ -34,7 +34,7 @@ pub enum Command {
   /// CPU metadata and modification utility.
   Cpu {
     #[command(flatten)]
-    verbosity: clap_verbosity_flag::Verbosity,
+    verbosity: clap_verbosity_flag::Verbosity<clap_verbosity_flag::InfoLevel>,
 
     #[clap(subcommand)]
     command: CpuCommand,
@@ -43,7 +43,7 @@ pub enum Command {
   /// Power supply metadata and modification utility.
   Power {
     #[command(flatten)]
-    verbosity: clap_verbosity_flag::Verbosity,
+    verbosity: clap_verbosity_flag::Verbosity<clap_verbosity_flag::InfoLevel>,
 
     #[clap(subcommand)]
     command: PowerCommand,
@@ -79,7 +79,7 @@ pub fn main() -> anyhow::Result<()> {
   | Command::Power { verbosity, .. }) = cli.command;
 
   env_logger::Builder::new()
-    .filter_level(verbosity.log_level_filter())
+    .filter_level(dbg!(verbosity.log_level_filter()))
     .format_timestamp(None)
     .format_module_path(false)
     .init();

watt/system.rs

@@ -50,12 +50,12 @@ impl System {
   }
 
   pub fn rescan(&mut self) -> anyhow::Result<()> {
-    log::debug!("rescanning view of system hardware...");
+    log::info!("rescanning view of system hardware...");
 
     {
       let start = Instant::now();
       self.cpus = cpu::Cpu::all().context("failed to scan CPUs")?;
-      log::debug!(
+      log::info!(
         "rescanned all CPUs in {millis}ms",
         millis = start.elapsed().as_millis(),
       );
@@ -65,7 +65,7 @@ impl System {
       let start = Instant::now();
       self.power_supplies = power_supply::PowerSupply::all()
         .context("failed to scan power supplies")?;
-      log::debug!(
+      log::info!(
         "rescanned all power supplies in {millis}ms",
         millis = start.elapsed().as_millis(),
       );
@@ -103,7 +103,7 @@ impl System {
     {
       let start = Instant::now();
       self.rescan_load_average()?;
-      log::debug!(
+      log::info!(
         "rescanned load average in {millis}ms",
         millis = start.elapsed().as_millis(),
       );
@@ -112,7 +112,7 @@ impl System {
     {
       let start = Instant::now();
       self.rescan_temperatures()?;
-      log::debug!(
+      log::info!(
         "rescanned temperatures in {millis}ms",
         millis = start.elapsed().as_millis(),
       );
@@ -164,7 +164,7 @@ impl System {
     if temperatures.is_empty() {
       const PATH: &str = "/sys/devices/virtual/thermal";
 
-      log::debug!(
+      log::warn!(
         "failed to get CPU temperature information by using hwmon, falling \
          back to '{PATH}'"
       );
@@ -342,7 +342,7 @@ impl System {
         },
 
         // Unknown, continue with other checks
-        _ => log::debug!("unknown chassis type"),
+        unknown => log::debug!("unknown chassis type: '{unknown}'"),
       }
     }