From 7d98b5e592e1fc9cf717ad77d314fc8913284b48 Mon Sep 17 00:00:00 2001
From: tmknight <tmknight88@gmail.com>
Date: Sun, 7 Jan 2024 13:28:18 -0500
Subject: [PATCH] Ensure env values return as lowercase; refine logs

---
 Cargo.lock  |  2 +-
 Cargo.toml  |  2 +-
 src/main.rs | 16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8eddb1..7e9abc4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -165,7 +165,7 @@ dependencies = [
 
 [[package]]
 name = "docker-autoheal"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "bollard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index e0311f1..bb84a29 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "docker-autoheal"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Travis M Knight <travis.knight@tmknight.net>"]
 license = "MIT"
 description = "Monitor and restart unhealthy docker containers"
diff --git a/src/main.rs b/src/main.rs
index 810484d..de8ff6d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,8 +15,8 @@ async fn log_message(msg: &str) {
 // Return environment variable
 fn get_env(key: &str, default: &str) -> String {
     match std::env::var(key) {
-        Ok(val) => return val,
-        Err(e) => return default.to_string(),
+        Ok(val) => return val.to_lowercase(),
+        Err(e) => return default.to_string().to_lowercase(),
     }
 }
 
@@ -78,7 +78,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         // Build container assessment criteria
         let mut filters = HashMap::new();
         filters.insert("health", vec!["unhealthy"]);
-        if autoheal_container_label != "ALL" {
+        if autoheal_container_label != "all" {
             filters.insert("label", vec![&autoheal_container_label]);
         }
 
@@ -112,12 +112,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
                         // Report what is transpiring
                         let msg0 = format!("Container '{}' ({}) unhealthy", name, id);
-                        // todo
-                        // let msg1 = format!(
-                        //     "Restarting '{}' with {}s timeout",
-                        //     name, autoheal_default_stop_timeout
-                        // );
-                        let msg1 = format!("Restarting '{}' now", name);
+                        let msg1 = format!(
+                            "Restarting '{}' with {}s timeout",
+                            name, autoheal_default_stop_timeout
+                        );
                         log_message(&msg0).await;
                         log_message(&msg1).await;