Use ccLogger anywhere

internal/ccLogger/cclogger.go

@@ -21,68 +21,72 @@ var (
 
 func initLogger() {
     if debugLog == nil {
-        debugLog = log.New(stderr, "DEBUG", log.LstdFlags)
+        debugLog = log.New(stderr, "DEBUG ", log.LstdFlags)
     }
     if infoLog == nil {
-        infoLog = log.New(stdout, "INFO", log.LstdFlags)
+        infoLog = log.New(stdout, "INFO ", log.LstdFlags)
     }
     if errorLog == nil {
-        errorLog = log.New(stderr, "ERROR", log.LstdFlags)
+        errorLog = log.New(stderr, "ERROR ", log.LstdFlags)
     }
     if warnLog == nil {
-        warnLog = log.New(stderr, "WARN", log.LstdFlags)
+        warnLog = log.New(stderr, "WARN ", log.LstdFlags)
     }
     if defaultLog == nil {
         defaultLog = log.New(stdout, "", log.LstdFlags)
     }
 }
 
-func CCPrint(logger *log.Logger, e ... interface {}) {
-    if logger != nil {
-        logger.Print(e)
-    }
-}
-
 func Print(e ... interface{}) {
-    CCPrint(defaultLog, e)
+    initLogger()
+    defaultLog.Print(e)
 }
 
 func ComponentPrint(component string, e ... interface{}) {
-    CCPrint(defaultLog, fmt.Sprintf("[%s]", component), e)
+    initLogger()
+    defaultLog.Print(fmt.Sprintf("[%s] ", component), e)
 }
 
 func Info(e ... interface{}) {
-    CCPrint(infoLog, e)
+    initLogger()
+    infoLog.Print(e)
 }
 
 func ComponentInfo(component string, e ... interface{}) {
-    CCPrint(infoLog, fmt.Sprintf("[%s]", component), e)
+    initLogger()
+    infoLog.Print(fmt.Sprintf("[%s] ", component), e)
 }
 
 func Debug(e ... interface{}) {
-    if globalDebug {
-        CCPrint(debugLog, e)
+    initLogger()
+    if globalDebug == true {
+        debugLog.Print(e)
     }
 }
 
 func ComponentDebug(component string, e ... interface{}) {
-    if globalDebug {
-        CCPrint(debugLog, fmt.Sprintf("[%s]", component),  e)
+    initLogger()
+    if globalDebug == true && debugLog != nil {
+        //CCComponentPrint(debugLog, component,  e)
+        debugLog.Print(fmt.Sprintf("[%s] ", component), e)
     }
 }
 
 func Error(e ... interface{}) {
+    initLogger()
     _, fn, line, _ := runtime.Caller(1)
-    CCPrint(errorLog, fn, line, e)
+    errorLog.Print(fmt.Sprintf("[%s:%d] ", fn, line), e)
 }
 
 func ComponentError(component string, e ... interface{}) {
+    initLogger()
     _, fn, line, _ := runtime.Caller(1)
-    CCPrint(errorLog, fmt.Sprintf("[%s]", component), fn, line, e)
+    errorLog.Print(fmt.Sprintf("[%s|%s:%d] ", component, fn, line), e)
 }
 
 func SetDebug() {
     globalDebug = true
+    initLogger()
 }
 
 

internal/metricRouter/metricRouter.go

@@ -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) {