Browse Source

Merge pull request #3711 from YevhenBondarenko/feature/alarm-state

AlarmState improvements
pull/3719/head
Igor Kulikov 6 years ago
committed by GitHub
parent
commit
cb6892bc3e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java

5
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java

@ -67,6 +67,7 @@ class AlarmState {
initCurrentAlarm(ctx);
lastMsgMetaData = msg.getMetaData();
lastMsgQueueName = msg.getQueueName();
this.dataSnapshot = data;
return createOrClearAlarms(ctx, data, update, AlarmRuleState::eval);
}
@ -190,7 +191,7 @@ class AlarmState {
}
}
private <T> TbAlarmResult calculateAlarmResult(TbContext ctx, AlarmRuleState ruleState) {
private TbAlarmResult calculateAlarmResult(TbContext ctx, AlarmRuleState ruleState) {
AlarmSeverity severity = ruleState.getSeverity();
if (currentAlarm != null) {
// TODO: In some extremely rare cases, we might miss the event of alarm clear (If one use in-mem queue and restarted the server) or (if one manipulated the rule chain).
@ -230,7 +231,7 @@ class AlarmState {
}
}
private <T> JsonNode createDetails(AlarmRuleState ruleState) {
private JsonNode createDetails(AlarmRuleState ruleState) {
ObjectNode details = JacksonUtil.OBJECT_MAPPER.createObjectNode();
String alarmDetails = ruleState.getAlarmRule().getAlarmDetails();

Loading…
Cancel
Save