Add logger level

Author: ufoscout

Cargo.lock

@@ -1,11 +1,13 @@
 [package]
 name = "wait"
-version = "2.7.3"
+version = "2.8.0"
 authors = ["ufoscout <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-port_check = "0.1.5"
+port_check = "0.1"
+log = "0.4"
+env_logger = { version = "0.8", default-features = false }
 
 [dev-dependencies]
 atomic-counter = "1.0"

Cargo.toml

@@ -1,3 +1,4 @@
+use log::*;
 use std::time::Duration;
 
 pub mod env_reader;
@@ -19,55 +20,53 @@ pub fn wait(
     config: &Config,
     on_timeout: &mut dyn FnMut(),
 ) {
-    println!("{}", LINE_SEPARATOR);
-    println!(" docker-compose-wait {}", env!("CARGO_PKG_VERSION"));
-    println!("---------------------------");
-    println!("Starting with configuration:");
-    println!(" - Hosts to be waiting for: [{}]", config.hosts);
-    println!(
+    info!("{}", LINE_SEPARATOR);
+    info!(" docker-compose-wait {}", env!("CARGO_PKG_VERSION"));
+    info!("---------------------------");
+    debug!("Starting with configuration:");
+    debug!(" - Hosts to be waiting for: [{}]", config.hosts);
+    debug!(
         " - Timeout before failure: {} seconds ",
         config.global_timeout
     );
-    println!(
+    debug!(
         " - TCP connection timeout before retry: {} seconds ",
         config.tcp_connection_timeout
     );
-    println!(
+    debug!(
         " - Sleeping time before checking for hosts availability: {} seconds",
         config.wait_before
     );
-    println!(
+    debug!(
         " - Sleeping time once all hosts are available: {} seconds",
         config.wait_after
     );
-    println!(
+    debug!(
         " - Sleeping time between retries: {} seconds",
         config.wait_sleep_interval
     );
-    println!("{}", LINE_SEPARATOR);
+    debug!("{}", LINE_SEPARATOR);
 
     if config.wait_before > 0 {
-        println!(
+        info!(
             "Waiting {} seconds before checking for hosts availability",
             config.wait_before
         );
-        println!("{}", LINE_SEPARATOR);
+        info!("{}", LINE_SEPARATOR);
         sleep.sleep(config.wait_before);
     }
 
     if !config.hosts.trim().is_empty() {
         sleep.reset();
         for host in config.hosts.trim().split(',') {
-            println!("Checking availability of {}", host);
+            info!("Checking availability of {}", host);
             while !port_check::is_port_reachable_with_timeout(
-                &host
-                    .trim()
-                    .to_string(),
+                &host.trim().to_string(),
                 Duration::from_secs(config.tcp_connection_timeout),
             ) {
-                println!("Host {} not yet available...", host);
+                info!("Host {} not yet available...", host);
                 if sleep.elapsed(config.global_timeout) {
-                    println!(
+                    error!(
                         "Timeout! After {} seconds some hosts are still not reachable",
                         config.global_timeout
                     );
@@ -76,22 +75,22 @@ pub fn wait(
                 }
                 sleep.sleep(config.wait_sleep_interval);
             }
-            println!("Host {} is now available!", host);
-            println!("{}", LINE_SEPARATOR);
+            info!("Host {} is now available!", host);
+            info!("{}", LINE_SEPARATOR);
         }
     }
 
     if config.wait_after > 0 {
-        println!(
+        info!(
             "Waiting {} seconds after hosts availability",
             config.wait_after
         );
-        println!("{}", LINE_SEPARATOR);
+        info!("{}", LINE_SEPARATOR);
         sleep.sleep(config.wait_after);
     }
 
-    println!("docker-compose-wait - Everything's fine, the application can now start!");
-    println!("{}", LINE_SEPARATOR);
+    info!("docker-compose-wait - Everything's fine, the application can now start!");
+    info!("{}", LINE_SEPARATOR);
 }
 
 pub fn config_from_env() -> Config {

src/lib.rs

@@ -1,4 +1,6 @@
 fn main() {
+    env_logger::init_from_env(env_logger::Env::default().filter_or("WAIT_LOGGER_LEVEL", "debug"));
+
     let mut sleep = wait::sleeper::new();
     wait::wait(&mut sleep, &wait::config_from_env(), &mut on_timeout);
 }

src/main.rs

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export WAIT_HOSTS=localhost:8025,localhost:8081,localhost:1433
+export WAIT_HOSTS=localhost:4748
 export WAIT_HOSTS_TIMEOUT=10
 export WAIT_BEFORE_HOSTS=1
 export WAIT_AFTER_HOSTS=2