lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Update log messages for consistency

Browse Source
This commit is contained in:
James Shubin
2017-03-16 13:14:50 -04:00
parent 33d20ac6d8
commit 3e001f9a1c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/main.go
View File

@@ -337,7 +337,7 @@ func (obj *Main) Run() error {
// state and wait for the parent to trigger the exit. // state and wait for the parent to trigger the exit.
if t := obj.ConvergedTimeout; obj.Depth == 0 && t >= 0 { if t := obj.ConvergedTimeout; obj.Depth == 0 && t >= 0 {
if b { if b {
log.Printf("Converged for %d seconds, exiting!", t) log.Printf("Main: Converged for %d seconds, exiting!", t)
obj.Exit(nil) // trigger an exit! obj.Exit(nil) // trigger an exit!
} }
return nil return nil
@@ -375,7 +375,7 @@ func (obj *Main) Run() error {
startChan := make(chan struct{}) // start signal startChan := make(chan struct{}) // start signal
close(startChan) // kick it off! close(startChan) // kick it off!
log.Println("Etcd: Starting...") log.Println("Main: Etcd: Starting...")
etcdChan := etcd.WatchAll(EmbdEtcd) etcdChan := etcd.WatchAll(EmbdEtcd)
first := true // first loop or not first := true // first loop or not
for { for {
@@ -413,7 +413,7 @@ func (obj *Main) Run() error {
} }
if obj.GAPI == nil { if obj.GAPI == nil {
log.Printf("Config: GAPI is empty!") log.Printf("Main: GAPI is empty!")
continue continue
} }
@@ -429,7 +429,7 @@ func (obj *Main) Run() error {
// make the graph from yaml, lib, puppet->yaml, or dsl! // make the graph from yaml, lib, puppet->yaml, or dsl!
newGraph, err := obj.GAPI.Graph() // generate graph! newGraph, err := obj.GAPI.Graph() // generate graph!
if err != nil { if err != nil {
log.Printf("Config: Error creating new graph: %v", err) log.Printf("Main: Error creating new graph: %v", err)
// unpause! // unpause!
if !first { if !first {
G.Start(first) // sync G.Start(first) // sync
@@ -467,7 +467,7 @@ func (obj *Main) Run() error {
log.Printf("Main: GraphSync...") log.Printf("Main: GraphSync...")
newFullGraph, err := newGraph.GraphSync(oldGraph) newFullGraph, err := newGraph.GraphSync(oldGraph)
if err != nil { if err != nil {
log.Printf("Config: Error running graph sync: %v", err) log.Printf("Main: Error running graph sync: %v", err)
// unpause! // unpause!
if !first { if !first {
G.Start(first) // sync G.Start(first) // sync
@@ -496,16 +496,16 @@ func (obj *Main) Run() error {
G.Start(first) // sync G.Start(first) // sync
converger.Start() // after G.Start() converger.Start() // after G.Start()
log.Printf("Graph: %v", G) // show graph log.Printf("Main: Graph: %v", G) // show graph
if obj.Graphviz != "" { if obj.Graphviz != "" {
filter := obj.GraphvizFilter filter := obj.GraphvizFilter
if filter == "" { if filter == "" {
filter = "dot" // directed graph default filter = "dot" // directed graph default
} }
if err := G.ExecGraphviz(filter, obj.Graphviz, hostname); err != nil { if err := G.ExecGraphviz(filter, obj.Graphviz, hostname); err != nil {
log.Printf("Graphviz: %v", err) log.Printf("Main: Graphviz: %v", err)
} else { } else {
log.Printf("Graphviz: Successfully generated graph!") log.Printf("Main: Graphviz: Successfully generated graph!")
} }
} }
first = false first = false
@@ -567,7 +567,7 @@ func (obj *Main) Run() error {
reterr := <-obj.exit // wait for exit signal reterr := <-obj.exit // wait for exit signal
log.Println("Destroy...") log.Println("Main: Destroy...")
if obj.GAPI != nil { if obj.GAPI != nil {
if err := obj.GAPI.Close(); err != nil { if err := obj.GAPI.Close(); err != nil {