fix: error msg

LilithGames · Jan 13, 2022 · 9170aad · 9170aad
1 parent bb9588b
commit 9170aad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/pkg/agent/data.go b/pkg/agent/data.go
@@ -169,11 +169,11 @@ func pushLocalData(report *transfer.Report) error {
 }
 
 func echoLocalData(planName string, view *ViewOpt) {
-	if os.Getenv("ECHO") != "ct" {
+	if os.Getenv("echo") != "ct" {
 		printQuantitySlice(planName+":H", quantities.Handler, view)
 		printQuantitySlice(planName+":E", quantities.Event, view)	
+		printErrorMessage(planName+":H", quantities.Handler, view)
+		printErrorMessage(planName+":E", quantities.Handler, view)
 	}
-	printErrorMessage(planName+":H", quantities.Handler, view)
-	printErrorMessage(planName+":E", quantities.Handler, view)
 	quantities = newQuantities()
 }
diff --git a/tools/log/log.go b/tools/log/log.go
@@ -2,14 +2,29 @@ package log
 
 import (
 	"bytes"
-	"go.uber.org/zap"
+	"os"
 	"runtime"
+	"time"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )
 
 var zapLogger *zap.Logger
 
 func init() {
-	zapLogger, _ = zap.NewProduction(zap.AddCaller(), zap.AddCallerSkip(1))
+	zapLogger = zap.New(getCore() , zap.AddCaller(), zap.AddCallerSkip(1))
+}
+
+func getCore() zapcore.Core {
+	cfg := zap.NewProductionEncoderConfig()
+	cfg.EncodeTime = func(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
+		enc.AppendString(t.Format("2006-01-02T15:04:05.000"))
+	}
+	cfg.EncodeLevel = zapcore.CapitalLevelEncoder
+	level := zapcore.PanicLevel
+	level.Set(os.Getenv("logLevel"))
+	return zapcore.NewCore(zapcore.NewConsoleEncoder(cfg), zapcore.Lock(os.Stdout), level)
 }
 
 // Debug logs a message at DebugLevel. The message includes any fields passed