From f648a6c8c2f96ccc17e0b02bd903dff5e04b482c Mon Sep 17 00:00:00 2001
From: 710leo <710leo@gmail.com>
Date: Mon, 27 Apr 2020 23:36:35 +0800
Subject: [PATCH] refactor: change some log print

---
 .github/PULL_REQUEST_TEMPLATE.md         |  3 +++
 src/modules/judge/backend/query/query.go |  1 +
 src/modules/judge/judge/judge.go         | 20 ++++++++++----------
 src/modules/judge/judge/nodata.go        |  7 ++++++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0b9ed6e6..fde96398 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,9 @@
 **What type of PR is this?**
 
 **What this PR does / why we need it**:
+<!--
+"Nice to have" "You need it" is not a good reason. :)
+-->
 
 **Which issue(s) this PR fixes**:
 <!--
diff --git a/src/modules/judge/backend/query/query.go b/src/modules/judge/backend/query/query.go
index e09fb097..d3eefe8c 100644
--- a/src/modules/judge/backend/query/query.go
+++ b/src/modules/judge/backend/query/query.go
@@ -45,6 +45,7 @@ func Query(reqs []*dataobj.QueryData) ([]*dataobj.TsdbQueryResponse, error) {
 		if err == nil {
 			break
 		}
+		time.Sleep(500 * time.Millisecond)
 	}
 	if err != nil {
 		return nil, err
diff --git a/src/modules/judge/judge/judge.go b/src/modules/judge/judge/judge.go
index 358bae54..11dbbb1e 100644
--- a/src/modules/judge/judge/judge.go
+++ b/src/modules/judge/judge/judge.go
@@ -67,7 +67,7 @@ func Judge(stra *model.Stra, exps []model.Exp, historyData []*dataobj.HistoryDat
 
 	if len(exps) < 1 {
 		stats.Counter.Set("stra.illegal", 1)
-		logger.Warningf("stra:%v exp is null", stra)
+		logger.Warningf("stra:%+v exp is null", stra)
 		return
 	}
 	exp := exps[0]
@@ -92,7 +92,7 @@ func Judge(stra *model.Stra, exps []model.Exp, historyData []*dataobj.HistoryDat
 		if len(exps) == 1 {
 			bs, err := json.Marshal(history)
 			if err != nil {
-				logger.Errorf("Marshal history:%v err:%v", history, err)
+				logger.Errorf("Marshal history:%+v err:%v", history, err)
 			}
 			event := &dataobj.Event{
 				ID:        fmt.Sprintf("s_%d_%s", stra.Id, firstItem.PrimaryKey()),
@@ -151,7 +151,7 @@ func Judge(stra *model.Stra, exps []model.Exp, historyData []*dataobj.HistoryDat
 				respData, err = GetData(stra, exps[1], firstItem, now, false)
 			}
 			if err != nil {
-				logger.Errorf("stra:%v get query data err:%v", stra, err)
+				logger.Errorf("stra:%+v get query data err:%v", stra, err)
 				return
 			}
 			for i := range respData {
@@ -169,7 +169,7 @@ func judgeItemWithStrategy(stra *model.Stra, historyData []*dataobj.HistoryData,
 
 	straParam := []interface{}{}
 	if firstItem.Step == 0 {
-		logger.Errorf("wrong step:%v", firstItem)
+		logger.Errorf("wrong step:%+v", firstItem)
 		return
 	}
 	straParam = append(straParam, stra.AlertDur/int(firstItem.Step))
@@ -177,13 +177,13 @@ func judgeItemWithStrategy(stra *model.Stra, historyData []*dataobj.HistoryData,
 	switch straFunc {
 	case "happen":
 		if len(exp.Params) < 1 {
-			logger.Errorf("stra:%d exp:%v stra param is null", stra.Id, exp)
+			logger.Errorf("stra:%d exp:%+v stra param is null", stra.Id, exp)
 			return
 		}
 		straParam = append(straParam, exp.Params[0])
 	case "c_avg", "c_avg_abs", "c_avg_rate", "c_avg_rate_abs":
 		if len(exp.Params) < 1 {
-			logger.Errorf("stra:%d exp:%v stra param is null", stra.Id, exp)
+			logger.Errorf("stra:%d exp:%+v stra param is null", stra.Id, exp)
 			return
 		}
 
@@ -194,12 +194,12 @@ func judgeItemWithStrategy(stra *model.Stra, historyData []*dataobj.HistoryData,
 
 		respItems, err := GetData(stra, exp, firstItem, now-int64(exp.Params[0]), true)
 		if err != nil {
-			logger.Errorf("stra:%v %v get compare data err:%v", stra.Id, exp, err)
+			logger.Errorf("stra:%v %+v get compare data err:%v", stra.Id, exp, err)
 			return
 		}
 
 		if len(respItems) != 1 || len(respItems[0].Values) < 1 {
-			logger.Errorf("stra:%d %v get compare data err, respItems:%v", stra.Id, exp, respItems)
+			logger.Errorf("stra:%d %+v get compare data err, respItems:%v", stra.Id, exp, respItems)
 			return
 		}
 
@@ -215,7 +215,7 @@ func judgeItemWithStrategy(stra *model.Stra, historyData []*dataobj.HistoryData,
 
 	fn, err := ParseFuncFromString(straFunc, straParam, exp.Eopt, exp.Threshold)
 	if err != nil {
-		logger.Errorf("stra:%d %v parse func fail: %v", stra.Id, exp, err)
+		logger.Errorf("stra:%d %+v parse func fail: %v", stra.Id, exp, err)
 		return
 	}
 
@@ -265,7 +265,7 @@ func GetData(stra *model.Stra, exp model.Exp, firstItem *dataobj.JudgeItem, now
 
 	if len(respData) < 1 {
 		stats.Counter.Set("get.data.null", 1)
-		err = fmt.Errorf("stra:%v get query data is null", stra)
+		err = fmt.Errorf("get query data is null")
 	}
 	return respData, err
 }
diff --git a/src/modules/judge/judge/nodata.go b/src/modules/judge/judge/nodata.go
index 630d155f..0e27010b 100644
--- a/src/modules/judge/judge/nodata.go
+++ b/src/modules/judge/judge/nodata.go
@@ -32,10 +32,15 @@ func nodataJudge() {
 	stras := cache.NodataStra.GetAll()
 	for _, stra := range stras {
 		//nodata处理
+		if len(stra.Endpoints) == 0 {
+			logger.Warningf("stra:%+v endpoints is null", stra)
+			continue
+		}
+
 		now := time.Now().Unix()
 		respData, err := GetData(stra, stra.Exprs[0], nil, now, false)
 		if err != nil {
-			logger.Errorf("stra:%v get query data err:%v", stra, err)
+			logger.Errorf("stra:%+v get query data err:%v", stra, err)
 			//获取数据报错，直接出发nodata
 			for _, endpoint := range stra.Endpoints {
 				if endpoint == "" {
-- 
GitLab