From d93838eaea5106d49bf1dccaa081dafc2dc3e1ea Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 04 七月 2019 16:00:10 +0800
Subject: [PATCH] 去掉联动任务报警后的退出程序
---
ruleserver/ruleToformula.go | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 1c26134..02d1dd0 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -4,7 +4,6 @@
"encoding/json"
"fmt"
"log"
- "os"
"ruleprocess/cache"
"sort"
"strconv"
@@ -292,10 +291,10 @@
if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || strings.HasPrefix(completeFormula, ">=") || strings.HasPrefix(completeFormula, "<=") || strings.HasPrefix(completeFormula, "==") || strings.HasPrefix(completeFormula, "!=") || strings.HasPrefix(completeFormula, ">") || strings.HasPrefix(completeFormula, "<") {
// 浠ヨ繖浜涘紑澶寸殑鍩烘湰鏄仈鍔ㄤ换鍔�
if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || strings.HasPrefix(completeFormula, ">=") || strings.HasPrefix(completeFormula, "<=") || strings.HasPrefix(completeFormula, "==") || strings.HasPrefix(completeFormula, "!=") {
- completeFormula = completeFormula[2 : len(completeFormula)-1]
+ completeFormula = completeFormula[2 :]
}
if strings.HasPrefix(completeFormula, ">") || strings.HasPrefix(completeFormula, "<") {
- completeFormula = completeFormula[1 : len(completeFormula)-1]
+ completeFormula = completeFormula[1 :]
}
log.Println("-------------------鐪嬬湅鎷旀瘺鍚庣殑琛ㄨ揪寮忥細",completeFormula)
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
@@ -572,7 +571,7 @@
if args.RuleResult["face"] != nil {
log.Println("-------------------face缁撴灉鏍囩", args.RuleResult["face"].([]Arg))
}
- os.Exit(0)
+ //os.Exit(0)
}
}
} else {
--
Gitblit v1.8.0