ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-07-19 03:11:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use ccLogger anywhere

Browse Source
This commit is contained in:
Thomas Roehl
2022-01-25 17:43:10 +01:00
parent b4fde31626
commit 2925ad9f40
8 changed files with 85 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
collectors/collectorManager.go
View File

@@ -70,17 +70,17 @@ func (cm *collectorManager) Init(ticker mct.MultiChanTicker, duration time.Durat
}
for k, cfg := range cm.config {
if _, found := AvailableCollectors[k]; !found {
cclog.ComponentPrint("CollectorManager", "SKIP unknown collector ", k)
cclog.ComponentError("CollectorManager", "SKIP unknown collector", k)
continue
}
c := AvailableCollectors[k]
err = c.Init(cfg)
if err != nil {
cclog.ComponentPrint("CollectorManager", "Collector ", k, "initialization failed: ", err.Error())
cclog.ComponentError("CollectorManager", "Collector", k, "initialization failed:", err.Error())
continue
}
cclog.ComponentDebug("CollectorManager", "Collector ", k, "initialized")
cclog.ComponentDebug("CollectorManager", "ADD COLLECTOR", c.Name())
cm.collectors = append(cm.collectors, c)
}
return nil
@@ -99,7 +99,7 @@ func (cm *collectorManager) Start() {
c.Close()
}
cm.wg.Done()
cclog.ComponentPrint("CollectorManager", "DONE")
cclog.ComponentDebug("CollectorManager", "DONE")
break CollectorManagerLoop
case t := <-tick:
for _, c := range cm.collectors {
@@ -110,17 +110,17 @@ func (cm *collectorManager) Start() {
c.Close()
}
cm.wg.Done()
cclog.ComponentPrint("CollectorManager", "DONE")
cclog.ComponentDebug("CollectorManager", "DONE")
break CollectorManagerInputLoop
default:
cclog.ComponentPrint("CollectorManager", c.Name(), " ", t)
cclog.ComponentDebug("CollectorManager", c.Name(), t)
c.Read(cm.duration, cm.output)
}
}
}
}
}()
cclog.ComponentPrint("CollectorManager", "STARTED")
cclog.ComponentDebug("CollectorManager", "STARTED")
}
func (cm *collectorManager) AddOutput(output chan lp.CCMetric) {
@@ -129,7 +129,7 @@ func (cm *collectorManager) AddOutput(output chan lp.CCMetric) {
func (cm *collectorManager) Close() {
cm.done <- true
cclog.ComponentPrint("CollectorManager", "CLOSE")
cclog.ComponentDebug("CollectorManager", "CLOSE")
}
func New(ticker mct.MultiChanTicker, duration time.Duration, wg *sync.WaitGroup, collectConfigFile string) (CollectorManager, error) {

4
collectors/tempMetric.go
View File

@@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"log"
cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
"os"
"path/filepath"
"strconv"
@@ -102,7 +102,7 @@ func (m *TempCollector) Read(interval time.Duration, output chan lp.CCMetric) {
if err == nil {
y, err := lp.New(strings.ToLower(mname), tags, m.meta, map[string]interface{}{"value": int(float64(x) / 1000)}, time.Now())
if err == nil {
log.Print("[", m.name, "] ", y)
cclog.ComponentDebug(m.name, y)
output <- y
}
}