diff --git a/pgraph/actions.go b/pgraph/actions.go index 8db259c6..0ced5ba2 100644 --- a/pgraph/actions.go +++ b/pgraph/actions.go @@ -431,7 +431,7 @@ Loop: playback = true log.Printf("%s[%s]: CheckApply errored: %v", v.Kind(), v.GetName(), e) if retry == 0 { - if err := obj.Prometheus().UpdateState(fmt.Sprintf("%v[%v]", v.Kind(), v.GetName()), v.Kind(), prometheus.ResStateHardFail); err != nil { + if err := obj.Prometheus().UpdateState(fmt.Sprintf("%s[%s]", v.Kind(), v.GetName()), v.Kind(), prometheus.ResStateHardFail); err != nil { // TODO: how to error this? log.Printf("%s[%s]: Prometheus.UpdateState() errored: %v", v.Kind(), v.GetName(), err) } @@ -444,7 +444,7 @@ Loop: if retry > 0 { // don't decrement the -1 retry-- } - if err := obj.Prometheus().UpdateState(fmt.Sprintf("%v[%v]", v.Kind(), v.GetName()), v.Kind(), prometheus.ResStateSoftFail); err != nil { + if err := obj.Prometheus().UpdateState(fmt.Sprintf("%s[%s]", v.Kind(), v.GetName()), v.Kind(), prometheus.ResStateSoftFail); err != nil { // TODO: how to error this? log.Printf("%s[%s]: Prometheus.UpdateState() errored: %v", v.Kind(), v.GetName(), err) } diff --git a/pgraph/autoedge.go b/pgraph/autoedge.go index f7a86763..6b32f450 100644 --- a/pgraph/autoedge.go +++ b/pgraph/autoedge.go @@ -39,7 +39,7 @@ func (g *Graph) addEdgesByMatchingUIDS(v *Vertex, uids []resources.ResUID) []boo continue } if g.Flags.Debug { - log.Printf("Compile: AutoEdge: Match: %v[%v] with UID: %v[%v]", vv.Kind(), vv.GetName(), uid.Kind(), uid.GetName()) + log.Printf("Compile: AutoEdge: Match: %s[%s] with UID: %s[%s]", vv.Kind(), vv.GetName(), uid.Kind(), uid.GetName()) } // we must match to an effective UID for the resource, // that is to say, the name value of a res is a helpful @@ -48,12 +48,12 @@ func (g *Graph) addEdgesByMatchingUIDS(v *Vertex, uids []resources.ResUID) []boo if resources.UIDExistsInUIDs(uid, vv.UIDs()) { // add edge from: vv -> v if uid.Reversed() { - txt := fmt.Sprintf("AutoEdge: %v[%v] -> %v[%v]", vv.Kind(), vv.GetName(), v.Kind(), v.GetName()) - log.Printf("Compile: Adding %v", txt) + txt := fmt.Sprintf("AutoEdge: %s[%s] -> %s[%s]", vv.Kind(), vv.GetName(), v.Kind(), v.GetName()) + log.Printf("Compile: Adding %s", txt) g.AddEdge(vv, v, NewEdge(txt)) } else { // edges go the "normal" way, eg: pkg resource - txt := fmt.Sprintf("AutoEdge: %v[%v] -> %v[%v]", v.Kind(), v.GetName(), vv.Kind(), vv.GetName()) - log.Printf("Compile: Adding %v", txt) + txt := fmt.Sprintf("AutoEdge: %s[%s] -> %s[%s]", v.Kind(), v.GetName(), vv.Kind(), vv.GetName()) + log.Printf("Compile: Adding %s", txt) g.AddEdge(v, vv, NewEdge(txt)) } found = true @@ -74,14 +74,14 @@ func (g *Graph) AutoEdges() { } autoEdgeObj := v.AutoEdges() if autoEdgeObj == nil { - log.Printf("%v[%v]: Config: No auto edges were found!", v.Kind(), v.GetName()) + log.Printf("%s[%s]: Config: No auto edges were found!", v.Kind(), v.GetName()) continue // next vertex } for { // while the autoEdgeObj has more uids to add... uids := autoEdgeObj.Next() // get some! if uids == nil { - log.Printf("%v[%v]: Config: The auto edge list is empty!", v.Kind(), v.GetName()) + log.Printf("%s[%s]: Config: The auto edge list is empty!", v.Kind(), v.GetName()) break // inner loop } if g.Flags.Debug { diff --git a/resources/resources.go b/resources/resources.go index b518e1b9..93750b7a 100644 --- a/resources/resources.go +++ b/resources/resources.go @@ -364,7 +364,7 @@ func (obj *BaseRes) Init() error { // TODO: this StatefulBool implementation could be eventually swappable //obj.refreshState = &DiskBool{Path: path.Join(dir, refreshPathToken)} - if err := obj.Prometheus().AddManagedResource(fmt.Sprintf("%v[%v]", obj.Kind(), obj.GetName()), obj.Kind()); err != nil { + if err := obj.Prometheus().AddManagedResource(fmt.Sprintf("%s[%s]", obj.Kind(), obj.GetName()), obj.Kind()); err != nil { return errwrap.Wrapf(err, "could not increase prometheus counter!") } @@ -385,7 +385,7 @@ func (obj *BaseRes) Close() error { close(obj.stopped) obj.waitGroup.Done() - if err := obj.Prometheus().RemoveManagedResource(fmt.Sprintf("%v[%v]", obj.Kind(), obj.GetName()), obj.kind); err != nil { + if err := obj.Prometheus().RemoveManagedResource(fmt.Sprintf("%s[%s]", obj.Kind(), obj.GetName()), obj.kind); err != nil { return errwrap.Wrapf(err, "could not decrease prometheus counter!") } diff --git a/yamlgraph/gconfig.go b/yamlgraph/gconfig.go index d15221e2..13b183e5 100644 --- a/yamlgraph/gconfig.go +++ b/yamlgraph/gconfig.go @@ -183,7 +183,7 @@ func (c *GraphConfig) NewGraphFromConfig(hostname string, world resources.World, if matched { // we've already matched this resource, should we match again? - log.Printf("Config: Warning: Matching %v[%v] again!", kind, res.GetName()) + log.Printf("Config: Warning: Matching %s[%s] again!", kind, res.GetName()) } matched = true @@ -196,7 +196,7 @@ func (c *GraphConfig) NewGraphFromConfig(hostname string, world resources.World, res.CollectPattern(t.Pattern) // res.Dirname = t.Pattern } - log.Printf("Collect: %v[%v]: collected!", kind, res.GetName()) + log.Printf("Collect: %s[%s]: collected!", kind, res.GetName()) // XXX: similar to other resource add code: if _, exists := lookup[kind]; !exists {