dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Andrew Shvayka 2016-12-20 12:52:16 +02:00
parent 54215215c5
commit dc188605d4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java
View File

@ -234,18 +234,18 @@ class RuleActorMessageProcessor extends ComponentMsgProcessor<RuleId> {
logger.info("[{}] Rule configuration was updated from {} to {}.", entityId, oldRuleMd, ruleMd); logger.info("[{}] Rule configuration was updated from {} to {}.", entityId, oldRuleMd, ruleMd);
try { try {
fetchPluginInfo(); fetchPluginInfo();
if (!Objects.equals(oldRuleMd.getFilters(), ruleMd.getFilters())) { if (filters == null || !Objects.equals(oldRuleMd.getFilters(), ruleMd.getFilters())) {
logger.info("[{}] Rule filters require restart due to json change from {} to {}.", logger.info("[{}] Rule filters require restart due to json change from {} to {}.",
entityId, mapper.writeValueAsString(oldRuleMd.getFilters()), mapper.writeValueAsString(ruleMd.getFilters())); entityId, mapper.writeValueAsString(oldRuleMd.getFilters()), mapper.writeValueAsString(ruleMd.getFilters()));
stopFilters(); stopFilters();
initFilters(); initFilters();
} }
if (!Objects.equals(oldRuleMd.getProcessor(), ruleMd.getProcessor())) { if (processor == null || !Objects.equals(oldRuleMd.getProcessor(), ruleMd.getProcessor())) {
logger.info("[{}] Rule processor require restart due to configuration change.", entityId); logger.info("[{}] Rule processor require restart due to configuration change.", entityId);
stopProcessor(); stopProcessor();
initProcessor(); initProcessor();
} }
if (!Objects.equals(oldRuleMd.getAction(), ruleMd.getAction())) { if (action == null || !Objects.equals(oldRuleMd.getAction(), ruleMd.getAction())) {
logger.info("[{}] Rule action require restart due to configuration change.", entityId); logger.info("[{}] Rule action require restart due to configuration change.", entityId);
stopAction(); stopAction();
initAction(); initAction();
@ -272,13 +272,15 @@ class RuleActorMessageProcessor extends ComponentMsgProcessor<RuleId> {
if (action != null) { if (action != null) {
if (filters != null) { if (filters != null) {
filters.forEach(f -> f.resume()); filters.forEach(f -> f.resume());
} else {
initFilters();
} }
if (processor != null) { if (processor != null) {
processor.resume(); processor.resume();
} else {
initProcessor();
} }
if (action != null) { action.resume();
action.resume();
}
logger.info("[{}] Rule resumed.", entityId); logger.info("[{}] Rule resumed.", entityId);
} else { } else {
start(); start();