From 583faacd9194ca117b27ddec726f3d281e8ad475 Mon Sep 17 00:00:00 2001 From: Thomas Roehl Date: Mon, 21 Feb 2022 13:23:20 +0100 Subject: [PATCH] Remove double error printing and return if measurements do not work --- collectors/likwidMetric.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/collectors/likwidMetric.go b/collectors/likwidMetric.go index f627a24..8626d7c 100644 --- a/collectors/likwidMetric.go +++ b/collectors/likwidMetric.go @@ -384,15 +384,13 @@ func (m *LikwidCollector) takeMeasurement(group int, interval time.Duration) err ret = C.perfmon_setupCounters(gid) if ret != 0 { gctr := C.GoString(C.perfmon_getGroupName(gid)) - err := fmt.Errorf("failed to setup performance group %s", gctr) - cclog.ComponentError(m.name, err.Error()) + err := fmt.Errorf("failed to setup performance group %d (%s)", gid, gctr) return err } ret = C.perfmon_startCounters() if ret != 0 { gctr := C.GoString(C.perfmon_getGroupName(gid)) - err := fmt.Errorf("failed to start performance group %s", gctr) - cclog.ComponentError(m.name, err.Error()) + err := fmt.Errorf("failed to start performance group %d (%s)", gid, gctr) return err } m.running = true @@ -401,8 +399,7 @@ func (m *LikwidCollector) takeMeasurement(group int, interval time.Duration) err ret = C.perfmon_stopCounters() if ret != 0 { gctr := C.GoString(C.perfmon_getGroupName(gid)) - err := fmt.Errorf("failed to stop performance group %s", gctr) - cclog.ComponentError(m.name, err.Error()) + err := fmt.Errorf("failed to stop performance group %d (%s)", gid, gctr) return err } return nil @@ -533,7 +530,7 @@ func (m *LikwidCollector) Read(interval time.Duration, output chan lp.CCMetric) err := m.takeMeasurement(i, interval) if err != nil { cclog.ComponentError(m.name, err.Error()) - continue + return } // read measurements and derive event set metrics m.calcEventsetMetrics(i, interval, output)