Skip to content

Commit

Permalink
Replace logging of errors
Browse files Browse the repository at this point in the history
  • Loading branch information
mrueg committed Sep 23, 2024
1 parent 63c2a0c commit 7c1a395
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func main() {

var metricsPath = "/metrics"
logger = promslog.New(promslogConfig)
logger.Debug("Starting SCP Exporter version "+version.Version+" git "+version.Revision)
logger.Debug("Starting SCP Exporter version " + version.Version + " git " + version.Revision)
client := soap.NewClient(netcupWSUrl)
wsclient := scpclient.NewWSEndUser(client)
scpCollector := metrics.NewScpCollector(wsclient, logger, loginName, password)
Expand All @@ -66,7 +66,7 @@ func main() {
}
landingPage, err := web.NewLandingPage(landingConfig)
if err != nil {
logger.Error("failed to create landing page", slog.Any("error", err))
logger.Error("failed to create landing page", "error", err.Error())
os.Exit(1)
}
http.Handle(metricsPath, promhttp.HandlerFor(
Expand Down
8 changes: 4 additions & 4 deletions pkg/metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package metrics

import (
"log/slog"
"encoding/xml"
"log/slog"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -126,7 +126,7 @@ func (collector *ScpCollector) Collect(ch chan<- prometheus.Metric) {
}
genericResponse, err := collector.client.GetVServers(genericRequest)
if err != nil {
collector.logger.Error("Unable to get servers", slog.Any("error", err))
collector.logger.Error("Unable to get servers", "error", err.Error())
}

debug, _ := xml.Marshal(genericResponse)
Expand All @@ -145,7 +145,7 @@ func (collector *ScpCollector) Collect(ch chan<- prometheus.Metric) {
debug, _ := xml.Marshal(infoResponse)
collector.logger.Debug(string(debug))
if err != nil {
collector.logger.Error("Unable to get Server Information", slog.Any("error", err))
collector.logger.Error("Unable to get Server Information", "error", err.Error())
}
// Create CPU / Memory info metrics
ch <- prometheus.MustNewConstMetric(collector.cpuCores, prometheus.GaugeValue, float64(infoResponse.Return_.CpuCores), *vserver)
Expand Down Expand Up @@ -216,7 +216,7 @@ func (collector *ScpCollector) Collect(ch chan<- prometheus.Metric) {
// Create start time metric
uptime, err := parseUptimeString(&infoResponse.Return_.Uptime)
if err != nil {
collector.logger.Error("Unable to parse uptime", slog.Any("error", err))
collector.logger.Error("Unable to parse uptime", "error", err.Error())
}
ch <- prometheus.MustNewConstMetric(collector.serverStartTime, prometheus.GaugeValue, float64(time.Now().Add(-uptime).Unix()), *vserver)
}
Expand Down

0 comments on commit 7c1a395

Please sign in to comment.