minor improvements to main

Stefano Torresi · Stefano Torresi · commit 3b6d5aac0818 · 2024-12-17T00:07:08.000+01:00
diff --git a/main.go b/main.go
@@ -11,6 +11,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/promlog"
+
 	// cannot use as setConfigDefault function will not work here
 	// log.level and log.format flags are set in vars/init
 	// "github.com/prometheus/common/promlog/flag"
@@ -66,7 +67,6 @@ var (
 )
 
 func init() {
-
 	config = viper.New()
 	config.SetConfigName("ha_cluster_exporter")
 	config.AddConfigPath("./")
@@ -247,7 +247,7 @@ func registerCollectors(logger log.Logger) (collectors []prometheus.Collector, e
 	}
 
 	for i, c := range collectors {
-		if c, ok := c.(collector.InstrumentableCollector); ok == true {
+		if c, ok := c.(collector.InstrumentableCollector); ok {
 			collectors[i] = collector.NewInstrumentedCollector(c, logger)
 		}
 	}
@@ -280,11 +280,11 @@ func main() {
 		level.Warn(logger).Log("msg", "Registration failure", "err", err)
 	}
 	if len(collectors) == 0 {
-		level.Error(logger).Log("msg", "No collector could be registered.", "err", err)
+		level.Error(logger).Log("msg", "No collector could be registered.")
 		os.Exit(1)
 	}
 	for _, c := range collectors {
-		if c, ok := c.(collector.SubsystemCollector); ok == true {
+		if c, ok := c.(collector.SubsystemCollector); ok {
 			level.Info(logger).Log("msg", c.GetSubsystem()+" collector registered.")
 		}
 	}
@@ -305,7 +305,7 @@ func main() {
 	serveAddress := &http.Server{Addr: fullListenAddress}
 	servePath := *webTelemetryPath
 
-	var landingPage = []byte(`<html>
+	landingPage := []byte(`<html>
 <head>
 	<title>ClusterLabs Linux HA Cluster Exporter</title>
 </head>

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"github.com/prometheus/client_golang/prometheus"`
`12`	`12`	`"github.com/prometheus/client_golang/prometheus/promhttp"`
`13`	`13`	`"github.com/prometheus/common/promlog"`
	`14`	`+`
`14`	`15`	`// cannot use as setConfigDefault function will not work here`
`15`	`16`	`// log.level and log.format flags are set in vars/init`
`16`	`17`	`// "github.com/prometheus/common/promlog/flag"`
`@@ -66,7 +67,6 @@ var (`
`66`	`67`	`)`
`67`	`68`
`68`	`69`	`func init() {`
`69`		`-`
`70`	`70`	`config = viper.New()`
`71`	`71`	`config.SetConfigName("ha_cluster_exporter")`
`72`	`72`	`config.AddConfigPath("./")`
`@@ -247,7 +247,7 @@ func registerCollectors(logger log.Logger) (collectors []prometheus.Collector, e`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`for i, c := range collectors {`
`250`		`- if c, ok := c.(collector.InstrumentableCollector); ok == true {`
	`250`	`+ if c, ok := c.(collector.InstrumentableCollector); ok {`
`251`	`251`	`collectors[i] = collector.NewInstrumentedCollector(c, logger)`
`252`	`252`	`}`
`253`	`253`	`}`
`@@ -280,11 +280,11 @@ func main() {`
`280`	`280`	`level.Warn(logger).Log("msg", "Registration failure", "err", err)`
`281`	`281`	`}`
`282`	`282`	`if len(collectors) == 0 {`
`283`		`- level.Error(logger).Log("msg", "No collector could be registered.", "err", err)`
	`283`	`+ level.Error(logger).Log("msg", "No collector could be registered.")`
`284`	`284`	`os.Exit(1)`
`285`	`285`	`}`
`286`	`286`	`for _, c := range collectors {`
`287`		`- if c, ok := c.(collector.SubsystemCollector); ok == true {`
	`287`	`+ if c, ok := c.(collector.SubsystemCollector); ok {`
`288`	`288`	`level.Info(logger).Log("msg", c.GetSubsystem()+" collector registered.")`
`289`	`289`	`}`
`290`	`290`	`}`
`@@ -305,7 +305,7 @@ func main() {`
`305`	`305`	`serveAddress := &http.Server{Addr: fullListenAddress}`
`306`	`306`	`servePath := *webTelemetryPath`
`307`	`307`
`308`		- var landingPage = []byte(`<html>
	`308`	+ landingPage := []byte(`<html>
`309`	`309`	`<head>`
`310`	`310`	`<title>ClusterLabs Linux HA Cluster Exporter</title>`
`311`	`311`	`</head>`