From 392917c5c8ad5ccbf7e2e02a3eea3d3b4bfe0cc3 Mon Sep 17 00:00:00 2001 From: like Date: Thu, 27 Jul 2023 18:30:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A2=84=E8=AD=A6=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=88=A0=E9=99=A4=E6=97=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=99=AE=E7=BD=97=E7=B1=B3=E4=BF=AE=E6=96=AF=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/alert_rules.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/service/alert_rules.go b/src/service/alert_rules.go index 94e4ca5..ba6d3f7 100644 --- a/src/service/alert_rules.go +++ b/src/service/alert_rules.go @@ -337,14 +337,15 @@ func (a *AlertRulesSvc) Delete(ids []string) (err error) { } if !exist { prSvc := PrometheusRuleSvc{User: a.User} - err = prSvc.Delete(response.AlertRulesItem{AlertRules: entity.AlertRules{Id: id}}) - if err != nil { - return + var has bool + _, has, err = prSvc.Get(response.AlertRulesItem{AlertRules: entity.AlertRules{Id: id}}) + if has { + err = prSvc.Delete(response.AlertRulesItem{AlertRules: entity.AlertRules{Id: id}}) + if err != nil { + return + } } _, err = db.NewSession().Where("id = ?", id).Delete(new(entity.AlertRules)) - if err != nil { - return - } } else { return errors.New("alert_rules_id already exists in opensearch") } -- 2.26.0