feat: improved logging

Signed-off-by: Sayan Paul <[email protected]>
fedora-iot · Oct 16, 2023 · 5996ca0 · 5996ca0
1 parent c0d93b4
commit 5996ca0
Showing 1 changed file with 29 additions and 11 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -47,16 +47,16 @@ impl GreenbootConfig {
             Ok(c) => {
                 config.max_reboot = match c.get_int("GREENBOOT_MAX_BOOT_ATTEMPTS") {
                     Ok(c) => c.try_into().unwrap_or_else(|e| {
-                        log::warn!("{e}, using default value");
+                        log::warn!("config format error:{e}, using default value");
                         config.max_reboot
                     }),
                     Err(e) => {
-                        log::warn!("{e}, using default value");
+                        log::warn!("error reading config:{e}, using default value");
                         config.max_reboot
                     }
                 }
             }
-            Err(e) => log::warn!("{e}, using default value"),
+            Err(e) => log::warn!("config file error:{e}, using default value"),
         }
         config
     }
@@ -112,8 +112,12 @@ fn run_diagnostics() -> Result<(), Error> {
             log::info!("running required check {}", entry.to_string_lossy());
             let output = Command::new("bash").arg("-C").arg(entry.clone()).output()?;
             if !output.status.success() {
-                log::error!("required script {} failed!", entry.to_string_lossy());
-                log::error!("reason: {}", String::from_utf8_lossy(&output.stderr));
+                log::warn!(
+                    "required script {} failed! \n{} \n{}",
+                    entry.to_string_lossy(),
+                    String::from_utf8_lossy(&output.stdout),
+                    String::from_utf8_lossy(&output.stderr)
+                );
                 script_failure = true;
             }
         }
@@ -129,8 +133,14 @@ fn run_diagnostics() -> Result<(), Error> {
             log::info!("running wanted check {}", entry.to_string_lossy());
             let output = Command::new("bash").arg("-C").arg(entry.clone()).output()?;
             if !output.status.success() {
-                log::warn!("wanted script {} failed!", entry.to_string_lossy());
-                log::warn!("reason: {}", String::from_utf8_lossy(&output.stderr));
+                log::warn!(
+                    "wanted script {} failed! \n{} \n{}",
+                    entry.to_string_lossy(),
+                    String::from_utf8_lossy(&output.stdout),
+                    String::from_utf8_lossy(&output.stderr)
+                );
+            } else {
+                log::warn!("wanted script {} success!", entry.to_string_lossy());
             }
         }
     }
@@ -149,8 +159,12 @@ fn run_red() -> Result<(), Error> {
             log::info!("running red check {}", entry.to_string_lossy());
             let output = Command::new("bash").arg("-C").arg(entry.clone()).output()?;
             if !output.status.success() {
-                log::warn!("red script: {} failed!", entry.to_string_lossy());
-                log::warn!("reason: {}", String::from_utf8_lossy(&output.stderr));
+                log::warn!(
+                    "red script {} failed! \n{} \n{}",
+                    entry.to_string_lossy(),
+                    String::from_utf8_lossy(&output.stdout),
+                    String::from_utf8_lossy(&output.stderr)
+                );
             }
         }
     }
@@ -165,8 +179,12 @@ fn run_green() -> Result<(), Error> {
             log::info!("running green check {}", entry.to_string_lossy());
             let output = Command::new("bash").arg("-C").arg(entry.clone()).output()?;
             if !output.status.success() {
-                log::warn!("green script {} failed!", entry.to_string_lossy());
-                log::warn!("reason: {}", String::from_utf8_lossy(&output.stderr));
+                log::warn!(
+                    "green script {} failed! \n{} \n{}",
+                    entry.to_string_lossy(),
+                    String::from_utf8_lossy(&output.stdout),
+                    String::from_utf8_lossy(&output.stderr)
+                );
             }
         }
     }