compiles and lists hypervisors

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 32 insertions, 36 deletions

diff --git a/http.go b/http.go
index ad23f37..b652333 100644
--- a/http.go
+++ b/http.go
@@ -4,9 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
-	"time"
 
-	"go.wit.com/lib/gui/shell"
 	pb "go.wit.com/lib/protobuf/virtbuf"
 	"go.wit.com/lib/virtigoxml"
 	"go.wit.com/log"
@@ -24,23 +22,19 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 
 	// is the cluster running what it should?
 	if tmp == "/droplets" {
-		for _, d := range me.droplets {
-			if d.pb.StartState != pb.DropletState_ON {
+		for _, d := range me.cluster.Droplets {
+			if d.StartState != pb.DropletState_ON {
 				continue
 			}
-			dur := time.Since(d.lastpoll) // Calculate the elapsed time
-			var hname string
-			if d.h == nil {
-				hname = ""
-			} else {
-				hname = d.h.pb.Hostname
-			}
-			if d.CurrentState != pb.DropletState_ON {
-				fmt.Fprintln(w, "BAD  STATE   ", d.pb.Hostname, hname, "(", d.pb.StartState, "vs", d.CurrentState, ")", shell.FormatDuration(dur))
-			} else {
-				dur := time.Since(d.lastpoll) // Calculate the elapsed time
-				fmt.Fprintln(w, "GOOD STATE ON", d.pb.Hostname, hname, shell.FormatDuration(dur))
-			}
+			/*
+				dur := time.Since(d.Lastpoll) // Calculate the elapsed time
+				if d.CurrentState != pb.DropletState_ON {
+					fmt.Fprintln(w, "BAD  STATE   ", d.Hostname, hname, "(", d.StartState, "vs", d.CurrentState, ")", shell.FormatDuration(dur))
+				} else {
+					dur := time.Since(d.lastpoll) // Calculate the elapsed time
+					fmt.Fprintln(w, "GOOD STATE ON", d.Hostname, hname, shell.FormatDuration(dur))
+				}
+			*/
 		}
 		return
 	}
@@ -81,26 +75,28 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 			log.Info("Handling URL:", tmp, "cluster is not right yet", s)
 			fmt.Fprintln(w, s)
 		}
-		for _, h := range me.hypers {
-			url := "http://" + h.pb.Hostname + ":2520/kill"
-			dur := time.Since(h.lastpoll) // Calculate the elapsed time
-			if dur > 90*time.Second {
-				h.RestartDaemon()
-				continue
+		/*
+			for _, h := range me.hypers {
+				url := "http://" + h.pb.Hostname + ":2520/kill"
+				dur := time.Since(h.lastpoll) // Calculate the elapsed time
+				if dur > 90*time.Second {
+					h.RestartDaemon()
+					continue
+				}
+				if h.killcount != 0 {
+					log.Info("KILL count =", h.killcount, "FOR", h.pb.Hostname, dur, "curl", url)
+				}
+				if h.killcount > 10 {
+					log.Info("KILL count is greater than 10 for host", h.pb.Hostname, dur, "curl", url)
+				}
+				// l :=  shell.FormatDuration(dur)
+				// log.Warn("HOST =", h.pb.Hostname, "Last poll =", l)
+				//if d.pb.StartState != "ON" {
+				//	continue
+				//}
+				// dur := time.Since(d.lastpoll) // Calculate the elapsed time
 			}
-			if h.killcount != 0 {
-				log.Info("KILL count =", h.killcount, "FOR", h.pb.Hostname, dur, "curl", url)
-			}
-			if h.killcount > 10 {
-				log.Info("KILL count is greater than 10 for host", h.pb.Hostname, dur, "curl", url)
-			}
-			// l :=  shell.FormatDuration(dur)
-			// log.Warn("HOST =", h.pb.Hostname, "Last poll =", l)
-			//if d.pb.StartState != "ON" {
-			//	continue
-			//}
-			// dur := time.Since(d.lastpoll) // Calculate the elapsed time
-		}
+		*/
 		return
 	}