From 96faedf4815731e6ac4b97f547bd3069b9299a23 Mon Sep 17 00:00:00 2001 From: Martin Lindhe Date: Thu, 10 Aug 2017 03:50:21 +0200 Subject: [PATCH] process,iis: fix log call --- collector/iis.go | 12 ++++++------ collector/process.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/collector/iis.go b/collector/iis.go index 860c46d3..b74deb9d 100644 --- a/collector/iis.go +++ b/collector/iis.go @@ -9,13 +9,13 @@ package collector import ( "flag" "fmt" + "log" "regexp" "golang.org/x/sys/windows/registry" "github.com/StackExchange/wmi" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/common/log" ) func init() { @@ -31,23 +31,23 @@ type simple_version struct { func getIISVersion() simple_version { k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\InetStp\`, registry.QUERY_VALUE) if err != nil { - log.Warnf("Couldn't open registry to determine IIS version: %v\n", err) + log.Println("warning: Couldn't open registry to determine IIS version:", err) return simple_version{} } defer k.Close() major, _, err := k.GetIntegerValue("MajorVersion") if err != nil { - log.Warnf("Couldn't open registry to determine IIS version: %v\n", err) + log.Println("warning: Couldn't open registry to determine IIS version:", err) return simple_version{} } minor, _, err := k.GetIntegerValue("MinorVersion") if err != nil { - log.Warnf("Couldn't open registry to determine IIS version: %v\n", err) + log.Println("warning: Couldn't open registry to determine IIS version:", err) return simple_version{} } - log.Debugf("Detected IIS %d.%d\n", major, minor) + log.Printf("Detected IIS %d.%d\n", major, minor) return simple_version{ major: major, @@ -815,7 +815,7 @@ func NewIISCollector() (Collector, error) { // to the provided prometheus Metric channel. func (c *IISCollector) Collect(ch chan<- prometheus.Metric) error { if desc, err := c.collect(ch); err != nil { - log.Errorf("[ERROR] failed collecting iis metrics:", desc, err) + log.Println("[ERROR] failed collecting iis metrics:", desc, err) return err } return nil diff --git a/collector/process.go b/collector/process.go index 26beb8fc..773d2233 100644 --- a/collector/process.go +++ b/collector/process.go @@ -5,12 +5,12 @@ package collector import ( "bytes" "flag" + "log" "strconv" "strings" "github.com/StackExchange/wmi" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/common/log" ) func init() { @@ -49,7 +49,7 @@ func NewProcessCollector() (Collector, error) { wc.WriteString("WHERE ") wc.WriteString(*processWhereClause) } else { - log.Warn("No where-clause specified for process collector. This will generate a very large number of metrics!") + log.Println("warning: No where-clause specified for process collector. This will generate a very large number of metrics!") } return &ProcessCollector{ @@ -139,7 +139,7 @@ func NewProcessCollector() (Collector, error) { // to the provided prometheus Metric channel. func (c *ProcessCollector) Collect(ch chan<- prometheus.Metric) error { if desc, err := c.collect(ch); err != nil { - log.Errorln("[ERROR] failed collecting process metrics:", desc, err) + log.Println("[ERROR] failed collecting process metrics:", desc, err) return err } return nil