From 37ffeb19d83534c80d306602a5cc094da024e04f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 02 八月 2019 19:48:21 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 6d7026f..083de8a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -149,10 +149,10 @@
fk := ruleserver.TrackOrNot(msg.RuleResult)
if fk {
InsertYolo(msg, "")
- if msg.Cid == "61de081a-7ed9-4970-8432-41d642c35456" {
- logger.Warn("鎹曟崏188鎽勫儚鏈虹殑鎸佺画鏃堕棿浠诲姟.....")
- os.Exit(1)
- }
+ //if msg.Cid == "61de081a-7ed9-4970-8432-41d642c35456" {
+ // logger.Warn("鎹曟崏188鎽勫儚鏈虹殑鎸佺画鏃堕棿浠诲姟.....")
+ // os.Exit(1)
+ //}
} else {
flag := ruleserver.BodyIsSame(msg.SdkMessage)
if !flag {
@@ -166,6 +166,7 @@
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
faces := PutFace(msg)
+ logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
if faces != nil {
for _,face := range faces {
// 涓婁紶澶у浘
@@ -175,7 +176,7 @@
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
alarmRules := []AlarmRule{}
- logger.Warn("浜鸿劯鐨勮鍒欓暱搴︿负锛�",len(face.rules))
+ logger.Warn("浜鸿劯id涓猴細",face.Id,"浜鸿劯鐨勮鍒欓暱搴︿负锛�",len(face.rules))
os.Exit(1)
for _,faceResult := range face.rules {
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
@@ -277,8 +278,9 @@
hebingFace(faces, faceResult)
}
return faces
+ } else {
+ return nil
}
- return nil
}
func hebingFace(faces []FaceAndRules, faceResult ruleserver.FaceResult) {
for _, arg := range faceResult.Args {
@@ -294,6 +296,7 @@
faces = append(faces, FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
}
}
+ logger.Info("鏁寸悊涓殑鏁版嵁",faces)
}
// 寰�es涓彃鍏olo鏁版嵁
--
Gitblit v1.8.0