Merge pull request #76 from tmknight/develop

v0.8.2

CHANGELOG.md

@@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## 0.8.2
+
+### Changed
+
+- Small change to how connection type assessed and reported for the sake of efficiency
+- Minor code cleanup
+
 ## 0.8.1
 
 ### Changed

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "docker-autoheal"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["Travis M Knight"]
 license = "GPL-3.0"
 description = "A cross-platform tool to monitor and remediate unhealthy Docker containers"

src/execute/connect.rs

@@ -12,11 +12,15 @@ pub async fn connect_docker(
     // Log final connection paramaters
     let msg0 = format!("Monitoring Docker via {}", connection_type);
     log_message(&msg0, INFO).await;
-    match connection_type.as_str() {
+
+    // Connect to Docker as specified
+    let docker = match connection_type.as_str() {
         "http" => {
             let msg1 = format!("Connecting to {}", tcp_address);
             log_message(&msg1, INFO).await;
+            Docker::connect_with_http(&tcp_address, tcp_timeout, API_DEFAULT_VERSION)
         }
+        "socket" => Docker::connect_with_socket_defaults(),
         "ssl" => {
             let msg1 = format!("Connecting to {}", tcp_address);
             log_message(&msg1, INFO).await;
@@ -25,27 +29,18 @@ pub async fn connect_docker(
                 key_path, cert_path, ca_path
             );
             log_message(&msg2, INFO).await;
+            Docker::connect_with_ssl(
+                &tcp_address,
+                std::path::Path::new(&key_path),
+                std::path::Path::new(&cert_path),
+                std::path::Path::new(&ca_path),
+                tcp_timeout,
+                API_DEFAULT_VERSION,
+            )
         }
-        &_ => {}
-    }
-    // Connect to Docker as specified
-    let docker = match connection_type.as_str() {
-        "http" => Docker::connect_with_http(
-            &tcp_address,
-            tcp_timeout,
-            API_DEFAULT_VERSION,
-        ),
-        "socket" => Docker::connect_with_socket_defaults(),
-        "ssl" => Docker::connect_with_ssl(
-            &tcp_address,
-            std::path::Path::new(&key_path),
-            std::path::Path::new(&cert_path),
-            std::path::Path::new(&ca_path),
-            tcp_timeout,
-            API_DEFAULT_VERSION,
-        ),
         &_ => Docker::connect_with_local_defaults(),
     };
+
     match docker {
         Ok(docker) => docker,
         Err(e) => {

src/execute/looper.rs

@@ -31,7 +31,7 @@ pub async fn start_loop(
 
             // Determine if stop override label
             let s = "autoheal.stop.timeout".to_string();
-            let autoheal_stop_timeout: isize = match container.labels {
+            let autoheal_stop_timeout = match container.labels {
                 Some(label) => match label.get(&s) {
                     Some(v) => v.parse().unwrap_or(autoheal_stop_timeout),
                     None => autoheal_stop_timeout,
@@ -53,7 +53,7 @@ pub async fn start_loop(
                 let name = name_tmp.trim_matches('/').trim();
 
                 // Get id of container
-                let id: String = match container.id {
+                let id = match container.id {
                     Some(id) => id.chars().take(12).collect(),
                     None => {
                         let msg0 = String::from("Could not reliably determine container id");

src/inquire/environment.rs

@@ -1,5 +1,5 @@
 use super::options::OptionsList;
-use crate::{log_message, ERROR, WARNING};
+use crate::{log_message, ALLOWED_CONNECTION_TYPES, ERROR, WARNING};
 
 pub struct VariablesList {
     pub connection_type: String,
@@ -29,15 +29,14 @@ fn get_env(key: &str, default: &str) -> String {
 pub async fn get_var(opt: OptionsList) -> VariablesList {
     let autoheal_connection_type: String = match opt.connection_type {
         None => {
-            let allowed_connection_types: Vec<&str> = vec!["local", "socket", "http", "ssl"];
             let env_connection_type = get_env("AUTOHEAL_CONNECTION_TYPE", "local");
-            match allowed_connection_types.contains(&env_connection_type.as_str()) {
+            match ALLOWED_CONNECTION_TYPES.contains(&env_connection_type.as_str()) {
                 true => env_connection_type,
                 false => {
                     let msg0 = format!(
-                        "Unexpected connection-type ({}): {}",
-                        allowed_connection_types.join(","),
-                        env_connection_type
+                        "Unexpected connection-type ({}): Expected one of {}",
+                        env_connection_type,
+                        ALLOWED_CONNECTION_TYPES.join(",")
                     );
                     log_message(&msg0, ERROR).await;
                     let msg1 = String::from("Attempting connection via default (local)");

src/inquire/options.rs

@@ -1,4 +1,4 @@
-use crate::report::logging::print_version;
+use crate::{report::logging::print_version, ALLOWED_CONNECTION_TYPES};
 use getopts::Options;
 
 pub struct OptionsList {
@@ -105,11 +105,10 @@ pub fn get_opts(args: Vec<String>) -> OptionsList {
     }
 
     // Ensure acceptable connection type arguments
-    let allowed_connection_types: Vec<&str> = vec!["local", "socket", "http", "ssl"];
     match matches.opt_str("c").is_some() {
         true => {
             let opt_connection_type = matches.opt_str("c").unwrap();
-            match allowed_connection_types.contains(&opt_connection_type.as_str()) {
+            match ALLOWED_CONNECTION_TYPES.contains(&opt_connection_type.as_str()) {
                 true => {}
                 false => {
                     println!("Unexpected connection-type: {}", opt_connection_type);

src/main.rs

@@ -26,10 +26,13 @@ pub const INFO: i8 = 0;
 pub const WARNING: i8 = 1;
 pub const ERROR: i8 = 2;
 
+// Allowed connection types
+pub const ALLOWED_CONNECTION_TYPES: [&str; 4] = ["local", "socket", "http", "ssl"];
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Collect binary arguments
-    let args: Vec<String> = std::env::args().collect();
+    let args = std::env::args().collect();
     let opt = get_opts(args);
 
     // Get Autoheal core variables