main.go

@@ -5,12 +5,10 @@ package main
 
 import (
 	"embed"
-	"fmt"
 	"os"
 	"time"
 
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/lib/hostname"
 	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
@@ -39,12 +37,12 @@ func main() {
 
 	}
 
-	if err := testZoo(); err != nil {
+	me.urlbase = "http://zookeeper.chap.wit.com:8080"
-		log.Info("FAILED TO CONNECT TO ZOOKEEPER: ", err)
+	if argv.URL != "" {
-		log.Info("sleeping for 3 minutes")
+		log.Info("USING ARGV URL:", argv.URL)
-		time.Sleep(3 * time.Minute)
+		me.urlbase = argv.URL
-		os.Exit(0)
 	}
+
 	me.pollDelay = 3 * time.Second
 	me.failcountmax = 20 // die every minute if zookeeper can't be found
 
@@ -56,52 +54,6 @@ func main() {
 	zood() // talks to zookeeper
 }
 
-func testZoo() error {
-	var err error
-	if argv.URL != "" {
-		log.Info("USING ARGV URL:", argv.URL)
-		if err = testURL(argv.URL, me.machine); err == nil {
-			me.urlbase = argv.URL
-			return nil
-		}
-	}
-
-	zooname := findZookeeper()
-
-	url := fmt.Sprintf("http://%s:8080/", zooname)
-	if err = testURL(url, me.machine); err == nil {
-		me.urlbase = url
-		return nil
-	}
-	url = fmt.Sprintf("https://%s/", zooname)
-	if err = testURL(url, me.machine); err == nil {
-		me.urlbase = url
-		return nil
-	}
-	url = "http://zookeeper.wit.com:8080/"
-	if err = testURL(url, me.machine); err == nil {
-		me.urlbase = url
-		return nil
-	}
-	url = "https://zookeeper.wit.com/"
-	if err = testURL(url, me.machine); err == nil {
-		me.urlbase = url
-		return nil
-	}
-	return err
-}
-
-func findZookeeper() string {
-	hname, dname, err := hostname.GetDomainname()
-	if err != nil {
-		log.Info("error with os.Hostname()", hname, dname, err)
-	}
-	if dname == "" {
-		return "zookeeper.wit.com"
-	}
-	return hostname.Join("zookeeper", dname)
-}
-
 func testURL(urlbase string, pb *zoopb.Machine) error {
 	newpb, wsPB, err := pb.HttpPost(urlbase, "test")
 	if err != nil {