From 0003027dcede5c5c0568e4138b365f4a6b579a29 Mon Sep 17 00:00:00 2001 From: Julius Volz Date: Mon, 12 Aug 2013 18:22:48 +0200 Subject: [PATCH] Add needed trailing spaces in logs. --- main.go | 12 ++++++------ notification/notification.go | 6 +++--- retrieval/target.go | 2 +- retrieval/target_provider.go | 2 +- retrieval/targetpool.go | 2 +- rules/ast/ast.go | 6 +++--- storage/metric/leveldb.go | 4 ++-- tools/dumper/main.go | 4 ++-- tools/pruner/main.go | 6 +++--- web/api/query.go | 4 ++-- web/blob/blob.go | 2 +- web/web.go | 8 ++++---- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/main.go b/main.go index 34b65ebf99..6e56afa442 100644 --- a/main.go +++ b/main.go @@ -173,7 +173,7 @@ func main() { ts, err := metric.NewTieredStorage(uint(*diskAppendQueueCapacity), 100, *arenaFlushInterval, *arenaTTL, *metricsStoragePath) if err != nil { - glog.Fatal("Error opening storage:", err) + glog.Fatal("Error opening storage: ", err) } unwrittenSamples := make(chan *extraction.Result, *samplesQueueCapacity) @@ -193,7 +193,7 @@ func main() { // Queue depth will need to be exposed ruleManager := rules.NewRuleManager(unwrittenSamples, notifications, conf.EvaluationInterval(), ts) if err := ruleManager.AddRulesFromConfig(conf); err != nil { - glog.Fatal("Error loading rule files:", err) + glog.Fatal("Error loading rule files: ", err) } go ruleManager.Run() @@ -272,7 +272,7 @@ func main() { err := prometheus.compact(*headAge, *headGroupSize) if err != nil { - glog.Error("could not compact:", err) + glog.Error("could not compact: ", err) } glog.Info("Done") } @@ -284,7 +284,7 @@ func main() { err := prometheus.compact(*bodyAge, *bodyGroupSize) if err != nil { - glog.Error("could not compact:", err) + glog.Error("could not compact: ", err) } glog.Info("Done") } @@ -296,7 +296,7 @@ func main() { err := prometheus.compact(*tailAge, *tailGroupSize) if err != nil { - glog.Error("could not compact:", err) + glog.Error("could not compact: ", err) } glog.Info("Done") } @@ -308,7 +308,7 @@ func main() { err := prometheus.delete(*deleteAge, deletionBatchSize) if err != nil { - glog.Error("could not delete:", err) + glog.Error("could not delete: ", err) } glog.Info("Done") } diff --git a/notification/notification.go b/notification/notification.go index 1df4dd44ca..0d6a99109b 100644 --- a/notification/notification.go +++ b/notification/notification.go @@ -96,7 +96,7 @@ func interpolateMessage(msg string, labels clientmodel.LabelSet, value clientmod "{{$value := .Value}}" if _, err := t.Parse(defs + msg); err != nil { - glog.Warning("Error parsing template:", err) + glog.Warning("Error parsing template: ", err) return msg } @@ -115,7 +115,7 @@ func interpolateMessage(msg string, labels clientmodel.LabelSet, value clientmod var buf bytes.Buffer if err := t.Execute(&buf, &tmplData); err != nil { - glog.Warning("Error executing template:", err) + glog.Warning("Error executing template: ", err) return msg } return buf.String() @@ -187,7 +187,7 @@ func (n *NotificationHandler) Run() { recordOutcome(time.Since(begin), err) if err != nil { - glog.Error("Error sending notification:", err) + glog.Error("Error sending notification: ", err) } } } diff --git a/retrieval/target.go b/retrieval/target.go index c0156238aa..db60bf8426 100644 --- a/retrieval/target.go +++ b/retrieval/target.go @@ -303,7 +303,7 @@ func (t *target) GlobalAddress() string { address := t.address hostname, err := os.Hostname() if err != nil { - glog.Warning("Couldn't get hostname: %s, returning target.Address()", err) + glog.Warningf("Couldn't get hostname: %s, returning target.Address()", err) return address } for _, localhostRepresentation := range localhostRepresentations { diff --git a/retrieval/target_provider.go b/retrieval/target_provider.go index 9ef2ca8d3b..8089bc70d7 100644 --- a/retrieval/target_provider.go +++ b/retrieval/target_provider.go @@ -78,7 +78,7 @@ func (p *sdTargetProvider) Targets() ([]Target, error) { for _, record := range response.Answer { addr, ok := record.(*dns.SRV) if !ok { - glog.Warning("%s is not a valid SRV record", addr) + glog.Warningf("%s is not a valid SRV record", addr) continue } // Remove the final dot from rooted DNS names to make them look more usual. diff --git a/retrieval/targetpool.go b/retrieval/targetpool.go index 8d15c633ac..5480b3d97d 100644 --- a/retrieval/targetpool.go +++ b/retrieval/targetpool.go @@ -127,7 +127,7 @@ func (p *TargetPool) runIteration(results chan<- *extraction.Result, interval ti if p.targetProvider != nil { targets, err := p.targetProvider.Targets() if err != nil { - glog.Warning("Error looking up targets, keeping old list: %s", err) + glog.Warningf("Error looking up targets, keeping old list: %s", err) } else { p.ReplaceTargets(targets) } diff --git a/rules/ast/ast.go b/rules/ast/ast.go index be82ffc2e3..393c5abb66 100644 --- a/rules/ast/ast.go +++ b/rules/ast/ast.go @@ -402,7 +402,7 @@ func (node *VectorAggregation) Eval(timestamp time.Time, view *viewAdapter) Vect func (node *VectorLiteral) Eval(timestamp time.Time, view *viewAdapter) Vector { values, err := view.GetValueAtTime(node.fingerprints, timestamp) if err != nil { - glog.Error("Unable to get vector values:", err) + glog.Error("Unable to get vector values: ", err) return Vector{} } return values @@ -590,7 +590,7 @@ func (node *MatrixLiteral) Eval(timestamp time.Time, view *viewAdapter) Matrix { } values, err := view.GetRangeValues(node.fingerprints, interval) if err != nil { - glog.Error("Unable to get values for vector interval:", err) + glog.Error("Unable to get values for vector interval: ", err) return Matrix{} } return values @@ -603,7 +603,7 @@ func (node *MatrixLiteral) EvalBoundaries(timestamp time.Time, view *viewAdapter } values, err := view.GetBoundaryValues(node.fingerprints, interval) if err != nil { - glog.Error("Unable to get boundary values for vector interval:", err) + glog.Error("Unable to get boundary values for vector interval: ", err) return Matrix{} } return values diff --git a/storage/metric/leveldb.go b/storage/metric/leveldb.go index 17133f65fe..6ff2b7e59f 100644 --- a/storage/metric/leveldb.go +++ b/storage/metric/leveldb.go @@ -104,7 +104,7 @@ func (l *LevelDBMetricPersistence) Close() { closer.Close() case errorCloser: if err := closer.Close(); err != nil { - glog.Error("Error closing persistence:", err) + glog.Error("Error closing persistence: ", err) } } } @@ -236,7 +236,7 @@ func NewLevelDBMetricPersistence(baseDirectory string) (*LevelDBMetricPersistenc if !workers.Wait() { for _, err := range workers.Errors() { - glog.Error("Could not open storage:", err) + glog.Error("Could not open storage: ", err) } return nil, fmt.Errorf("Unable to open metric persistence.") diff --git a/tools/dumper/main.go b/tools/dumper/main.go index 33182031b0..0768a3d898 100644 --- a/tools/dumper/main.go +++ b/tools/dumper/main.go @@ -110,13 +110,13 @@ func main() { entire, err := persistence.MetricSamples.ForEach(dumper, dumper, dumper) if err != nil { - glog.Fatal("Error dumping samples:", err) + glog.Fatal("Error dumping samples: ", err) } if !entire { glog.Fatal("Didn't scan entire corpus") } dumper.Flush() if err = dumper.Error(); err != nil { - glog.Fatal("Error flushing CSV:", err) + glog.Fatal("Error flushing CSV: ", err) } } diff --git a/tools/pruner/main.go b/tools/pruner/main.go index c71401ab37..99e96ce392 100644 --- a/tools/pruner/main.go +++ b/tools/pruner/main.go @@ -44,9 +44,9 @@ func main() { start := time.Now() glog.Info("Starting compaction...") size, _ := persistences.Sizes() - glog.Info("Original Size:", size) + glog.Info("Original Size: ", size) persistences.Prune() - glog.Info("Finished in", time.Since(start)) + glog.Info("Finished in ", time.Since(start)) size, _ = persistences.Sizes() - glog.Info("New Size:", size) + glog.Info("New Size: ", size) } diff --git a/web/api/query.go b/web/api/query.go index 75971428b1..1734debe21 100644 --- a/web/api/query.go +++ b/web/api/query.go @@ -123,14 +123,14 @@ func (serv MetricsService) Metrics() string { serv.setAccessControlHeaders(rb) rb.SetContentType(gorest.Application_Json) if err != nil { - glog.Error("Error loading metric names:", err) + glog.Error("Error loading metric names: ", err) rb.SetResponseCode(http.StatusInternalServerError) return err.Error() } sort.Sort(metricNames) resultBytes, err := json.Marshal(metricNames) if err != nil { - glog.Error("Error marshalling metric names:", err) + glog.Error("Error marshalling metric names: ", err) rb.SetResponseCode(http.StatusInternalServerError) return err.Error() } diff --git a/web/blob/blob.go b/web/blob/blob.go index 47f1dd7ae1..d71d7e561f 100644 --- a/web/blob/blob.go +++ b/web/blob/blob.go @@ -51,7 +51,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { file, err := GetFile(StaticFiles, name) if err != nil { if err != io.EOF { - glog.Warning("Could not get file:", err) + glog.Warning("Could not get file: ", err) } w.WriteHeader(http.StatusNotFound) return diff --git a/web/web.go b/web/web.go index f3f7fbdf54..cf74c78816 100644 --- a/web/web.go +++ b/web/web.go @@ -76,7 +76,7 @@ func (w WebService) ServeForever() error { exp.Handle("/user/", http.StripPrefix("/user/", http.FileServer(http.Dir(*userAssetsPath)))) } - glog.Info("listening on %s", *listenAddress) + glog.Info("listening on ", *listenAddress) return http.ListenAndServe(*listenAddress, exp.DefaultCoarseMux) } @@ -93,7 +93,7 @@ func getEmbeddedTemplate(name string) (*template.Template, error) { file, err := blob.GetFile(blob.TemplateFiles, "_base.html") if err != nil { - glog.Error("Could not read base template:", err) + glog.Error("Could not read base template: ", err) return nil, err } t.Parse(string(file)) @@ -130,12 +130,12 @@ func getTemplate(name string) (t *template.Template, err error) { func executeTemplate(w http.ResponseWriter, name string, data interface{}) { tpl, err := getTemplate(name) if err != nil { - glog.Error("Error preparing layout template:", err) + glog.Error("Error preparing layout template: ", err) return } err = tpl.Execute(w, data) if err != nil { - glog.Error("Error executing template:", err) + glog.Error("Error executing template: ", err) } }