--- a/backend/smartRuleSystem.js
+++ b/backend/smartRuleSystem.js
@@ -32,6 +32,8 @@
checkLastFalseNotifications(eachRule, function(isOK, newValue){
if(isOK) {
updateRule(eachRule, newValue);
+ }else{
+ deleteRule(eachRule.rulesID);
}
})
}else{
@@ -62,6 +64,8 @@
checkLastFalseNotifications(eachRule, function(isOK, newValue){
if(isOK) {
updateRule(eachRule, newValue);
+ }else{
+ deleteRule(eachRule.rulesID);
}
})
}else{
@@ -112,7 +116,13 @@
conditionValue: rule.conditionValue,
controlValue: parseFloat(rule.threshold / 100)*parseFloat(rule.controlValue),
threshold: rule.threshold,
- notificationType: rule.notificationType,
+ notifyType: rule.notifyType,
+ notificationType: rule.notificationType,
+ hostname: rule.hostname,
+ port: rule.port,
+ path: rule.path,
+ method: rule.method,
+ emailTo: rule.emailTo,
token: rule.token
};
}else if(newConditionValue > 0){
@@ -122,7 +132,13 @@
conditionValue: rule.conditionValue,
controlValue: newConditionValue,
threshold: rule.threshold,
- notificationType: rule.notificationType,
+ notifyType: rule.notifyType,
+ notificationType: rule.notificationType,
+ hostname: rule.hostname,
+ port: rule.port,
+ path: rule.path,
+ method: rule.method,
+ emailTo: rule.emailTo,
token: rule.token
};
}
@@ -162,7 +178,13 @@
conditionValue: rule.conditionValue,
controlValue: parseFloat(rule.threshold / 100)*parseFloat(rule.controlValue),
threshold: rule.threshold,
- notificationType: rule.notificationType,
+ notifyType: rule.notifyType,
+ notificationType: rule.notificationType,
+ hostname: rule.hostname,
+ port: rule.port,
+ path: rule.path,
+ method: rule.method,
+ emailTo: rule.emailTo,
token: rule.token
};
}else if(newConditionValue > 0){
@@ -172,7 +194,13 @@
conditionValue: rule.conditionValue,
controlValue: newConditionValue,
threshold: rule.threshold,
- notificationType: rule.notificationType,
+ notifyType: rule.notifyType,
+ notificationType: rule.notificationType,
+ hostname: rule.hostname,
+ port: rule.port,
+ path: rule.path,
+ method: rule.method,
+ emailTo: rule.emailTo,
token: rule.token
};
}