Skip to content

Commit 7133c9f

Browse files
committed
modify: modify handlerSQLAudit and modify UpdateManagerSQLBySqlId params
1 parent 3a42db3 commit 7133c9f

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

sqle/model/instance_audit_plan.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,9 +499,9 @@ func (s *Storage) UpdateManagerSQLStatus(txDB *gorm.DB, sql *SQLManageRecord) er
499499
return txDB.Exec(query, sql.SQLID).Error
500500
}
501501

502-
func (s *Storage) UpdateManagerSQLBySqlId(sql *SQLManageRecord) error {
503-
err := s.db.Model(&SQLManageRecord{}).Where("sql_id = ?", sql.SQLID).
504-
Updates(map[string]interface{}{"audit_level": sql.AuditLevel, "audit_results": sql.AuditResults, "priority": sql.Priority}).Error
502+
func (s *Storage) UpdateManagerSQLBySqlId(sqlManageMap map[string]interface{}, sqlId string) error {
503+
err := s.db.Model(&SQLManageRecord{}).Where("sql_id = ?", sqlId).
504+
Updates(sqlManageMap).Error
505505
if err != nil {
506506
return err
507507
}

sqle/server/auditplan/job_task_handler.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ func (j *AuditPlanHandlerJob) HandlerSQL(entry *logrus.Entry) {
9494
return
9595
}
9696

97-
go handlerSQLAudit(sqlList, entry)
97+
go handlerSQLAudit(entry, sqlList)
9898

9999
}
100100

101101
// todo: 错误处理
102-
func handlerSQLAudit(sqlList []*model.SQLManageRecord, entry *logrus.Entry) {
102+
func handlerSQLAudit(entry *logrus.Entry, sqlList []*model.SQLManageRecord) {
103103
s := model.GetStorage()
104104
sqlList, err := BatchAuditSQLs(sqlList, true)
105105
if err != nil {
@@ -111,7 +111,11 @@ func handlerSQLAudit(sqlList []*model.SQLManageRecord, entry *logrus.Entry) {
111111
entry.Warnf("set sql priority sql failed, error: %v", err)
112112
}
113113
for _, sql := range sqlList {
114-
err = s.UpdateManagerSQLBySqlId(sql)
114+
manageSqlParam := make(map[string]interface{}, 3)
115+
manageSqlParam["audit_level"] = sql.AuditLevel
116+
manageSqlParam["audit_results"] = sql.AuditResults
117+
manageSqlParam["priority"] = sql.Priority
118+
err = s.UpdateManagerSQLBySqlId(manageSqlParam, sql.SQLID)
115119
if err != nil {
116120
entry.Warnf("update manager sql failed, error: %v", err)
117121
continue

0 commit comments

Comments
 (0)