整改日志格式

service/node-check/node_check.go

@@ -3,8 +3,8 @@ package node_check
 import (
 	"context"
 	"git.quantgroup.cn/DevOps/enoch/service/dingding"
+	"git.quantgroup.cn/DevOps/enoch/service/log"
 	"git.quantgroup.cn/DevOps/enoch/service/registry"
-	"log"
 	"net/http"
 	"os"
 	"sync"
@@ -48,12 +48,14 @@ func handler(serviceName string) {
 	if url, ok := HandlerMap.Load(serviceName); ok {
 		for i := 0; i < HttpGetRetryCount; i++ {
 			if resp, e := httpGet(url.(string), HttpTimeOut); e != nil {
-				log.Print("ERROR", " handler service: ", e)
+				logger.Error.Print(" handler service: ", serviceName, " ", e)
 			} else {
-				log.Print("INFO", " handler service: ", resp.StatusCode)
+				logger.Info.Print(" handler service: ", serviceName, " ", resp.StatusCode)
 				break
 			}
 		}
+	} else {
+		logger.Info.Print( " handler service: ", serviceName, " ", "not found handler hook api")
 	}
 }
 
@@ -76,11 +78,11 @@ func (w watch) UpdateNodes(service *registry.Service) {
 
 	//判断是否告警
 	if v, ok := servicesStatus.Load(service.Name); ok && v.(string) == Passing && !serviceOK {
-		log.Print("PANIC ", service.Name, " ", nodeStr, "---!!!service critical!!!---")
+		logger.Warning.Print(service.Name, " ", nodeStr, "---!!!service critical!!!---")
 		_ = dingding.SenderDingDing(service.Name+" "+nodeStr+" "+"---!!!service critical!!!---", dingding.DefaultDingURL)
 		handler(service.Name)
 	} else {
-		log.Print("INFO ", service.Name, " ", nodeStr)
+		logger.Info.Print(service.Name, " ", nodeStr)
 	}
 
 	//更新服务状态
@@ -125,7 +127,7 @@ func InitServiceStatus() {
 func NodeCheck() {
 	defer func() {
 		if e := recover(); e != nil {
-			log.Print("node check panic: ", e)
+			logger.Info.Print("node check panic: ", e)
 			_ = dingding.SenderDingDing("node check panic!", dingding.DefaultDingURL)
 			time.Sleep(time.Second*1)
 			NodeCheck()
@@ -136,7 +138,7 @@ func NodeCheck() {
 	dc := "3c"
 	cluster := []string{"172.30.12.2:8500", "172.30.12.3:8500", "172.30.12.4:8500"}
 	if e := registry.Init("consul", map[string]interface{}{"dc": dc, "cluster": cluster}); e != nil {
-		log.Print("registry init error:", e)
+		logger.Info.Print("registry init error:", e)
 		os.Exit(-1)
 	}
 	time.Sleep(time.Second * 1)
@@ -146,7 +148,7 @@ func NodeCheck() {
 
 	//设置观察者
 	if e := registry.SetObserver("watch", &watch{}); e != nil {
-		log.Print("set observer error:", e)
+		logger.Info.Print("set observer error:", e)
 		os.Exit(-1)
 	}