From f41c88a46559febc29cfb8da348efe9c1d7aa47a Mon Sep 17 00:00:00 2001
From: JesusPerez <jpl@jesusperez.pro>
Date: Sat, 9 Oct 2021 00:56:46 +0100
Subject: [PATCH] chore: fix https_check

---
 src/utils.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/utils.rs b/src/utils.rs
index f03f47b..af19dba 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -10,12 +10,12 @@ use std::process::{Command};
 use hyper_tls::HttpsConnector;
 use hyper::Client;
 use hyper::http::StatusCode;
-use std::error::Error;
 
 use crate::defs::{SSHAccess,Cntrllr};
 use crate::clouds::defs::{Cloud};
 
-pub async fn https_check(url: &str) -> Result<(), Box<dyn Error>> {
+pub async fn https_check(url: &str) -> Result<()> { // }, Box<dyn Error>> {
+	let debug=envmnt::get_isize("DEBUG",0);
 	let https = HttpsConnector::new();
 	let client = Client::builder().build::<_, hyper::Body>(https);
 	let req = client.get(url.parse()?).await;
@@ -23,17 +23,17 @@ pub async fn https_check(url: &str) -> Result<(), Box<dyn Error>> {
 		Ok(res) => 
 			match res.status() {
 				StatusCode::OK => {
-					println!("OK");
 					Ok(())
 				},
 				_ => {
-					dbg!(res.status());
-					println!("Err");
-					Err("Error".into())
+          if debug > 2 {
+					 dbg!(res.status());
+					}
+			    Err(anyhow!("Error on {}",&url))
 				},
 		},
 		Err(e)  => {
-			Err(format!("Error {}: {}",&url,e).into())
+			Err(anyhow!("Error {}: {}",&url,e))
 		},
 	}
 }
@@ -91,9 +91,15 @@ pub fn source_host() -> String {
 		cntrllr_host.to_owned()
 	}
 }
-pub async fn liveness_check(source: &str,cntrllrs: &Vec<Cntrllr>,serverstring: &str,tsk_name: &str) -> Result<()> {
+pub async fn liveness_check(source: &str,cntrllrs: &Vec<Cntrllr>,serverstring: &str,live_req: &str, tsk_name: &str) -> Result<()> {
 	let debug=envmnt::get_isize("DEBUG",0);
 	// let serverstring = format!("{}:22",&hostname);
+	if live_req == "https" {
+		if debug > 1 {
+		  println!("liveness_check: {} {}",&live_req,&serverstring);
+		}
+		return https_check(&serverstring).await;
+	}
 	let mut check_cntrllr = Cntrllr::default();
 	for cntrllr in cntrllrs {
 		let serverstring = format!("{}:{}",&cntrllr.sshaccess.host,&cntrllr.sshaccess.port);