[pinpoint-apm#9000] Backport: Fix incorrect funciton calls when webho…

…ok.enable=false
emeroad · Jul 26, 2022 · 819734e · 819734e
1 parent f358745
commit 819734e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/AlarmServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/AlarmServiceImpl.java
@@ -44,7 +44,7 @@ public AlarmServiceImpl(AlarmDao alarmDao, WebhookSendInfoDao webhookSendInfoDao
 
     @Override
     public String insertRule(Rule rule) {
-        return alarmDao.insertRule(rule);
+        return alarmDao.insertRuleExceptWebhookSend(rule);
     }
 
     @Override
@@ -81,13 +81,14 @@ public List<Rule> selectRuleByApplicationId(String applicationId) {
 
     @Override
     public void updateRule(Rule rule) {
-        alarmDao.updateRule(rule);
+        alarmDao.updateRuleExceptWebhookSend(rule);
         alarmDao.deleteCheckerResult(rule.getRuleId());
     }
 
     @Override
     public void updateRuleWithWebhooks(Rule rule, List<String> webhookIds) {
-        updateRule(rule);
+        alarmDao.updateRule(rule);
+        alarmDao.deleteCheckerResult(rule.getRuleId());
 
         List<WebhookSendInfo> oldListofWebhookInfos = webhookSendInfoDao.selectWebhookSendInfoByRuleId(rule.getRuleId());