From 73ad1ba960121de8315304099671a37764c6485e Mon Sep 17 00:00:00 2001 From: Calle Pettersson Date: Thu, 4 Oct 2018 21:58:52 +0200 Subject: [PATCH] Lint-fix: vetshadow --- collector/mssql.go | 8 ++++---- tools/collector-generator/generate-collector.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/collector/mssql.go b/collector/mssql.go index dcdf8cdd..22cb8733 100644 --- a/collector/mssql.go +++ b/collector/mssql.go @@ -363,7 +363,7 @@ func NewMSSQLCollector() (Collector, error) { const subsystem = "mssql" - MSSQLCollector := MSSQLCollector{ + mssqlCollector := MSSQLCollector{ // meta mssqlScrapeDurationDesc: prometheus.NewDesc( prometheus.BuildFQName(Namespace, subsystem, "collector_duration_seconds"), @@ -1635,17 +1635,17 @@ func NewMSSQLCollector() (Collector, error) { mssqlInstances: getMSSQLInstances(), } - MSSQLCollector.mssqlCollectors = MSSQLCollector.getMSSQLCollectors() + mssqlCollector.mssqlCollectors = mssqlCollector.getMSSQLCollectors() if *mssqlPrintCollectors { fmt.Printf("Available SQLServer Classes:\n") - for name := range MSSQLCollector.mssqlCollectors { + for name := range mssqlCollector.mssqlCollectors { fmt.Printf(" - %s\n", name) } os.Exit(0) } - return &MSSQLCollector, nil + return &mssqlCollector, nil } type mssqlCollectorFunc func(ch chan<- prometheus.Metric, sqlInstance string) (*prometheus.Desc, error) diff --git a/tools/collector-generator/generate-collector.go b/tools/collector-generator/generate-collector.go index 1c929aca..e9221b63 100644 --- a/tools/collector-generator/generate-collector.go +++ b/tools/collector-generator/generate-collector.go @@ -25,7 +25,7 @@ func main() { panic(err) } var data TemplateData - if err := json.Unmarshal(bytes, &data); err != nil { + if err = json.Unmarshal(bytes, &data); err != nil { panic(err) } @@ -33,7 +33,7 @@ func main() { "toLower": strings.ToLower, "toSnakeCase": toSnakeCase, } - template, err := template.New("template").Funcs(funcs).ParseFiles("collector.template") + template, err = template.New("template").Funcs(funcs).ParseFiles("collector.template") if err != nil { panic(err) }