move common code to zoopbv0.0.9v0.0.18v0.0.17v0.0.16v0.0.15v0.0.14v0.0.13v0.0.12v0.0.11v0.0.10

1 files changed, 1 insertions, 13 deletions

diff --git a/main.go b/main.go
index 3b5bbba..0329ad5 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
 
@@ -35,21 +34,10 @@ func main() {
 	me = new(stuff)
 	me.urlbase = "http://zookeeper.grid.wit.com:8080"
 
-	me.hostname, _ = os.Hostname()
 	me.pollDelay = 3 * time.Second
 	me.failcountmax = 20 // die every minute if zookeeper can't be found
 
-	// what OS?
-	me.distro = initDistro()
-
-	// init my machine protobuf
-	me.machine = new(zoopb.Machine)
-	me.machine.Packages = new(zoopb.Packages)
-	me.machine.Hostname = me.hostname
-
-	// init the installed package list
-	// me.packages = new(zoopb.Packages)
-	initPackages()
+	me.machine.ConfigLoad()
 
 	go NewWatchdog()