From 98a93a35dfc90c4cb26186d4a5b2595fb57d68d2 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 05 八月 2019 10:16:36 +0800
Subject: [PATCH] ”合并了compare分支
---
insertdata/insertDataToEs.go | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 2e24c25..ac4bca5 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -7,7 +7,6 @@
"fmt"
"io/ioutil"
"net"
- "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strings"
@@ -166,7 +165,7 @@
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
faces := []*FaceAndRules{}
- PutFace(faces,msg)
+ faces = PutFace(faces,msg)
logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
if faces != nil {
for _,face := range faces {
@@ -178,7 +177,7 @@
}
alarmRules := []AlarmRule{}
logger.Warn("浜鸿劯id涓猴細",face.Id,"浜鸿劯鐨勮鍒欓暱搴︿负锛�",len(face.rules))
- os.Exit(1)
+ //os.Exit(1)
for _,faceResult := range face.rules {
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState})
@@ -271,15 +270,18 @@
}
// 褰掔疆浜鸿劯
-func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg){
+func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg)[]*FaceAndRules{
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
logger.Info("鏁寸悊浜鸿劯鏁版嵁")
for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
- hebingFace(faces, faceResult)
+ faces = hebingFace(faces, faceResult)
}
+ return faces
+ } else {
+ return nil
}
}
-func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult){
+func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult) []*FaceAndRules{
for _, arg := range faceResult.Args {
// 鎷垮埌姣忎竴寮犱汉鑴�
flag := false
@@ -294,6 +296,7 @@
}
}
logger.Info("鏁寸悊涓殑鏁版嵁",faces)
+ return faces
}
// 寰�es涓彃鍏olo鏁版嵁
--
Gitblit v1.8.0