100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Start new rule engines after initial facts inserted
Rich Turnerbe3ed076a091
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex 59af5de88..74d35ca52 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -443,7 +443,15 @@ public class JsonRulesBuilder extends RulesBuilder {public void start(RulesFacts facts) {Arrays.stream(jsonRules).forEach(jsonRule ->executeRuleActions(jsonRule, jsonRule.onStart, "onStart", false, facts, null, assetsFacade, usersFacade, notificationsFacade, timerService, assetStorageService, this.scheduledActionConsumer));++ // Initialise asset statesonAssetStatesChanged(facts);++ // Initialise trigger state - prevents rules firing based on initial asset states+ Arrays.stream(jsonRules).forEach(jsonRule -> {+ log(Level.FINEST, "Initialising rule trigger states for rule: " + jsonRule.name);+ ruleEvaluationMap.get(jsonRule.name).conditionStateMap.values().forEach(RuleTriggerState::update);+ });}public void onAssetStatesChanged(RulesFacts facts) {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex 6e357bfe0..a81dc58f5 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -208,6 +208,7 @@ public class RulesEngine<T extends Ruleset> {// Check for previous version of this rulesetRulesetDeployment deployment = deployments.get(ruleset.getId());+ boolean wasRunning = this.running;stop();@@ -248,7 +249,10 @@ public class RulesEngine<T extends Ruleset> {deployments.put(ruleset.getId(), deployment);updateDeploymentInfo();- start();++ if (wasRunning) {+ start();+ }}/**diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 979ed75c3..287e8839c 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -54,6 +54,7 @@ import org.openremote.model.value.ObjectValue;import javax.persistence.EntityManager;import java.util.*;+import java.util.concurrent.atomic.AtomicBoolean;import java.util.function.BiFunction;import java.util.logging.Logger;import java.util.stream.Collectors;@@ -256,6 +257,7 @@ public class RulesService extends RouteBuilder implements ContainerService, AsseupdateAssetState(assetState, true, true);});});+}@Override@@ -488,6 +490,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asseif (newEngine != null) {// Push all existing facts into the engine, this is an initial import of state so fire delayedassetStates.forEach(assetState -> newEngine.updateFact(assetState, false));+ newEngine.start();}} else if (ruleset instanceof TenantRuleset) {@@ -500,6 +503,7 @@ public class RulesService extends RouteBuilder implements ContainerService, AssenewEngine.updateFact(assetState, false);}});+ newEngine.start();}} else if (ruleset instanceof AssetRuleset) {@@ -512,6 +516,8 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse// initial import of state so fire delayedgetAssetStatesInScope(((AssetRuleset) ruleset).getAssetId()).forEach(assetState -> newEngine.updateFact(assetState, false));++ newEngine.start();}}}@@ -542,6 +548,11 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse}globalEngine.addRuleset(ruleset);++ if (created) {+ globalEngine.start();+ }+return created ? globalEngine : null;});}@@ -561,12 +572,12 @@ public class RulesService extends RouteBuilder implements ContainerService, Asseprotected RulesEngine<TenantRuleset> deployTenantRuleset(TenantRuleset ruleset) {return withLockReturning(getClass().getSimpleName() + "::deployTenantRuleset", () -> {- final boolean[] created = {false};+ AtomicBoolean created = new AtomicBoolean(false);// Look for existing rules engines for this tenantRulesEngine<TenantRuleset> tenantRulesEngine = tenantEngines.computeIfAbsent(ruleset.getRealm(), (realm) -> {- created[0] = true;+ created.set(true);return new RulesEngine<>(timerService,identityService,@@ -582,7 +593,11 @@ public class RulesService extends RouteBuilder implements ContainerService, AssetenantRulesEngine.addRuleset(ruleset);- return created[0] ? tenantRulesEngine : null;+ if (created.get()) {+ tenantRulesEngine.start();+ }++ return created.get() ? tenantRulesEngine : null;});}@@ -630,12 +645,12 @@ public class RulesService extends RouteBuilder implements ContainerService, Asseprotected RulesEngine<AssetRuleset> deployAssetRuleset(AssetRuleset ruleset) {return withLockReturning(getClass().getSimpleName() + "::deployAssetRuleset", () -> {- final boolean[] created = {false};+ AtomicBoolean created = new AtomicBoolean(false);// Look for existing rules engine for this assetRulesEngine<AssetRuleset> assetRulesEngine = assetEngines.computeIfAbsent(ruleset.getAssetId(), (assetId) -> {- created[0] = true;+ created.set(true);return new RulesEngine<>(timerService,identityService,@@ -649,8 +664,12 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse);});+ if (created.get()) {+ assetRulesEngine.start();+ }+assetRulesEngine.addRuleset(ruleset);- return created[0] ? assetRulesEngine : null;+ return created.get() ? assetRulesEngine : null;});}