Merge pull request #388 from actiontech/issue_382

Issue 382
actiontech · Mar 18, 2022 · 24e9d1c · 24e9d1c
2 parents 73c6700 + 504fd2d
commit 24e9d1c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/sqle/api/controller/v1/audit_plan.go b/sqle/api/controller/v1/audit_plan.go
@@ -786,7 +786,6 @@ func TriggerAuditPlan(c echo.Context) error {
 	if err != nil {
 		return controller.JSONBaseErrorReq(c, err)
 	}
-
 	return c.JSON(http.StatusOK, &TriggerAuditPlanResV1{
 		BaseRes: controller.NewBaseReq(nil),
 		Data: AuditPlanReportResV1{

diff --git a/sqle/driver/driver.go b/sqle/driver/driver.go
@@ -52,13 +52,15 @@ type DSN struct {
 type RuleLevel string
 
 const (
+	RuleLevelNull   RuleLevel = "" // used to indicate no rank
 	RuleLevelNormal RuleLevel = "normal"
 	RuleLevelNotice RuleLevel = "notice"
 	RuleLevelWarn   RuleLevel = "warn"
 	RuleLevelError  RuleLevel = "error"
 )
 
 var ruleLevelMap = map[RuleLevel]int{
+	RuleLevelNull:   -1,
 	RuleLevelNormal: 0,
 	RuleLevelNotice: 1,
 	RuleLevelWarn:   2,
@@ -73,6 +75,10 @@ func (r RuleLevel) More(l RuleLevel) bool {
 	return ruleLevelMap[r] > ruleLevelMap[l]
 }
 
+func (r RuleLevel) MoreOrEqual(l RuleLevel) bool {
+	return ruleLevelMap[r] >= ruleLevelMap[l]
+}
+
 type Rule struct {
 	Name string
 	Desc string
@@ -312,7 +318,7 @@ func NewInspectResults() *AuditResult {
 
 // Level find highest Level in result
 func (rs *AuditResult) Level() RuleLevel {
-	level := RuleLevelNormal
+	level := RuleLevelNull
 	for _, curr := range rs.results {
 		if ruleLevelMap[curr.level] > ruleLevelMap[level] {
 			level = curr.level

diff --git a/sqle/server/audit.go b/sqle/server/audit.go
@@ -87,9 +87,9 @@ func audit(l *logrus.Entry, task *model.Task, d driver.Driver) (err error) {
 
 func replenishTaskStatistics(task *model.Task) {
 	var normalCount float64
-	maxAuditLevel := driver.RuleLevelNormal
+	maxAuditLevel := driver.RuleLevelNull
 	for _, executeSQL := range task.ExecuteSQLs {
-		if executeSQL.AuditLevel == string(driver.RuleLevelNormal) {
+		if driver.RuleLevelNormal.MoreOrEqual(driver.RuleLevel(executeSQL.AuditLevel)) {
 			normalCount += 1
 		}
 		if driver.RuleLevel(executeSQL.AuditLevel).More(maxAuditLevel) {