summaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'main.go')
-rw-r--r--main.go40
1 files changed, 29 insertions, 11 deletions
diff --git a/main.go b/main.go
index e7d3feb..7fd9f38 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,6 @@ import (
"path/filepath"
"time"
- "github.com/google/uuid"
"go.wit.com/dev/alexflint/arg"
pb "go.wit.com/lib/protobuf/virtbuf"
"go.wit.com/lib/virtigoxml"
@@ -42,18 +41,28 @@ func main() {
me.unstable = time.Now() // initialize the grid as unstable
me.delay = 5 * time.Second // how often to poll the hypervisors
me.changed = false
- me.events = new(pb.Events)
- u := uuid.New()
- me.events.Uuid = u.String()
- me.events.Version = "dirty v1"
- me.dmap = make(map[*pb.Droplet]*DropletT)
+ me.dmap = make(map[*pb.Droplet]*DropletT)
- err := cfgfile()
- if err != nil {
- log.Warn("reading config file failed", err)
+ // read in the config file
+ me.cluster = new(pb.Cluster)
+ if err := me.cluster.ConfigLoad(); err != nil {
+ log.Info("config load error", err)
os.Exit(-1)
}
+ // me.cluster.Events = new(pb.Events)
+ // u := uuid.New()
+ // me.events.Uuid = u.String()
+ // me.events.Version = "dirty v1"
+
+ /*
+ err := cfgfile()
+ if err != nil {
+ log.Warn("reading config file failed", err)
+ os.Exit(-1)
+ }
+ */
+
var newEvents []*pb.Event
// sanity check the droplets
@@ -91,10 +100,19 @@ func main() {
log.Info(i, "Event:", e.Droplet, e.FieldName, "orig:", e.OrigVal, "new:", e.NewVal)
me.changed = true
}
+ if err := me.cluster.ConfigSave(); err != nil {
+ log.Info("configsave error", err)
+ }
+
+ os.Exit(0)
if me.changed {
if argv.Save {
- writeConfigFile()
- writeConfigFileDroplets()
+ if err := me.cluster.ConfigSave(); err != nil {
+ log.Info("configsave error", err)
+ os.Exit(-1)
+ }
+ // writeConfigFile()
+ // writeConfigFileDroplets()
log.Info("XML changes saved in protobuf config")
os.Exit(0)
} else {