ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-11-04 10:45:06 +01: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

25
internal/metricRouter/metricRouter.go
View File

@@ -2,7 +2,7 @@ package metricRouter
import (
"encoding/json"
"log"
cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
"os"
"sync"
"time"
@@ -50,14 +50,14 @@ func (r *metricRouter) Init(ticker mct.MultiChanTicker, wg *sync.WaitGroup, rout
r.ticker = ticker
configFile, err := os.Open(routerConfigFile)
if err != nil {
log.Print(err.Error())
cclog.ComponentError("MetricRouter", err.Error())
return err
}
defer configFile.Close()
jsonParser := json.NewDecoder(configFile)
err = jsonParser.Decode(&r.config)
if err != nil {
log.Print(err.Error())
cclog.ComponentError("MetricRouter", err.Error())
return err
}
return nil
@@ -79,7 +79,7 @@ func (r *metricRouter) StartTimer() {
func (r *metricRouter) EvalCondition(Cond string, point lp.CCMetric) (bool, error) {
expression, err := govaluate.NewEvaluableExpression(Cond)
if err != nil {
log.Print(Cond, " = ", err.Error())
cclog.ComponentDebug("MetricRouter", Cond, " = ", err.Error())
return false, err
}
params := make(map[string]interface{})
@@ -97,7 +97,7 @@ func (r *metricRouter) EvalCondition(Cond string, point lp.CCMetric) (bool, erro
result, err := expression.Evaluate(params)
if err != nil {
log.Print(Cond, " = ", err.Error())
cclog.ComponentDebug("MetricRouter", Cond, " = ", err.Error())
return false, err
}
return bool(result.(bool)), err
@@ -113,7 +113,7 @@ func (r *metricRouter) DoAddTags(point lp.CCMetric) {
var err error
conditionMatches, err = r.EvalCondition(m.Condition, point)
if err != nil {
log.Print(err.Error())
cclog.ComponentError("MetricRouter", err.Error())
conditionMatches = false
}
}
@@ -133,7 +133,7 @@ func (r *metricRouter) DoDelTags(point lp.CCMetric) {
var err error
conditionMatches, err = r.EvalCondition(m.Condition, point)
if err != nil {
log.Print(err.Error())
cclog.ComponentError("MetricRouter", err.Error())
conditionMatches = false
}
}
@@ -154,7 +154,7 @@ func (r *metricRouter) Start() {
RouterLoop:
select {
case <-r.done:
log.Print("[MetricRouter] DONE\n")
cclog.ComponentDebug("MetricRouter", "DONE")
r.wg.Done()
break RouterLoop
default:
@@ -162,11 +162,11 @@ func (r *metricRouter) Start() {
RouterInputLoop:
select {
case <-r.done:
log.Print("[MetricRouter] DONE\n")
cclog.ComponentDebug("MetricRouter", "DONE")
r.wg.Done()
break RouterInputLoop
case p := <-c:
log.Print("[MetricRouter] FORWARD ", p)
cclog.ComponentDebug("MetricRouter", "FORWARD", p)
r.DoAddTags(p)
r.DoDelTags(p)
if r.config.IntervalStamp {
@@ -180,9 +180,8 @@ func (r *metricRouter) Start() {
}
}
}
log.Print("[MetricRouter] EXIT\n")
}()
log.Print("[MetricRouter] STARTED\n")
cclog.ComponentDebug("MetricRouter", "STARTED")
}
func (r *metricRouter) AddInput(input chan lp.CCMetric) {
@@ -195,7 +194,7 @@ func (r *metricRouter) AddOutput(output chan lp.CCMetric) {
func (r *metricRouter) Close() {
r.done <- true
log.Print("[MetricRouter] CLOSE\n")
cclog.ComponentDebug("MetricRouter", "CLOSE")
}
func New(ticker mct.MultiChanTicker, wg *sync.WaitGroup, routerConfigFile string) (MetricRouter, error) {