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
Fixed problem with rules not running anymore with rule in error state and continue on error true
Michael Rademakerdfae4d3d0c57
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex 349ca1844..8d2253145 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -195,7 +195,7 @@ public class RulesEngine<T extends Ruleset> {* started.*/public boolean isDeployed() {- return deployments.values().stream().allMatch(rd -> rd.getStatus() == DEPLOYED);+ return deployments.values().stream().allMatch(rd -> rd.getStatus() == DEPLOYED || rd.getRuleset().isContinueOnError());}public void addRuleset(T ruleset) {@@ -432,12 +432,9 @@ public class RulesEngine<T extends Ruleset> {deployment.setError(ex);publishRulesetStatus(deployment.getRuleset(), deployment.getStatus(), deployment.getErrorMessage());- // TODO We always stop on any error, good idea?// TODO We only get here on LHS runtime errors, RHS runtime errors are in RuleFacts.onFailure()-- if (!deployment.ruleset.isContinueOnError()) {+ if (ex instanceof RulesLoopException || !deployment.ruleset.isContinueOnError()) {stop();- // TODO We skip any other deployment when we hit the first error, good idea?break;}} finally {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesFacts.java b/manager/src/main/java/org/openremote/manager/rules/RulesFacts.javaindex 5aa38e40c..c6cafb364 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesFacts.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesFacts.java@@ -348,11 +348,7 @@ public class RulesFacts extends Facts implements RuleListener {if (evaluationResult) {triggerCount++;if (triggerCount >= MAX_RULES_TRIGGERED_PER_EXECUTION) {- throw new IllegalStateException(- "Possible rules loop detected, exceeded max trigger count of "- + MAX_RULES_TRIGGERED_PER_EXECUTION- + " for rule: " + rule.getName()- );+ throw new RulesLoopException(MAX_RULES_TRIGGERED_PER_EXECUTION, rule.getName());}}}diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesLoopException.java b/manager/src/main/java/org/openremote/manager/rules/RulesLoopException.javanew file mode 100644index 000000000..ef3312176--- /dev/null+++ b/manager/src/main/java/org/openremote/manager/rules/RulesLoopException.java@@ -0,0 +1,28 @@+/*+ * Copyright 2017, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.manager.rules;++public class RulesLoopException extends IllegalStateException {++ public RulesLoopException(int maxLoopLimit, String ruleName) {+ super("Possible rules loop detected, exceeded max trigger count of "+ + maxLoopLimit + " for rule: " + ruleName);+ }+}diff --git a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java b/model/src/main/java/org/openremote/model/rules/AssetRuleset.javaindex 0ec81a230..9a6581737 100644--- a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/AssetRuleset.java@@ -102,6 +102,7 @@ public class AssetRuleset extends Ruleset {", createdOn='" + createdOn + '\'' +", lastModified='" + lastModified + '\'' +", enabled='" + enabled + '\'' ++ ", continueOnError='" + continueOnError + '\'' +", realm='" + realm + '\'' +", assetId='" + assetId + '\'' +", accessPublicRead='" + accessPublicRead + '\'' +diff --git a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.javaindex 863b6bda0..f07014f25 100644--- a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java@@ -59,6 +59,7 @@ public class GlobalRuleset extends Ruleset {", createdOn='" + createdOn + '\'' +", lastModified='" + lastModified + '\'' +", enabled='" + enabled + '\'' ++ ", continueOnError='" + continueOnError + '\'' +'}';}diff --git a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java b/model/src/main/java/org/openremote/model/rules/TenantRuleset.javaindex 3ba3564eb..3abafa0d4 100644--- a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/TenantRuleset.java@@ -89,6 +89,7 @@ public class TenantRuleset extends Ruleset {", createdOn='" + createdOn + '\'' +", lastModified='" + lastModified + '\'' +", enabled='" + enabled + '\'' ++ ", continueOnError='" + continueOnError + '\'' +", realm='" + realm + '\'' +", accessPublicRead='" + accessPublicRead + '\'' +'}';diff --git a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy b/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovyindex 5ac3635ce..8a3715219 100644--- a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy+++ b/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy@@ -3,6 +3,7 @@ package org.openremote.test.failureimport org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesFacts+import org.openremote.manager.rules.RulesLoopExceptionimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupService@@ -140,7 +141,7 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine"Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text,managerDemoSetup.apartment2Id,false,- false+ true)ruleset = rulesetStorageService.merge(ruleset)@@ -149,7 +150,7 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaineapartment2Engine = rulesService.assetEngines.get(managerDemoSetup.apartment2Id)assert apartment2Engine != nullassert apartment2Engine.deployments[ruleset.id].status == RulesetStatus.EXECUTION_ERROR- assert apartment2Engine.deployments[ruleset.id].error instanceof IllegalStateException+ assert apartment2Engine.deployments[ruleset.id].error instanceof RulesLoopExceptionassert apartment2Engine.deployments[ruleset.id].error.message == "Possible rules loop detected, exceeded max trigger count of " + RulesFacts.MAX_RULES_TRIGGERED_PER_EXECUTION + " for rule: Condition loops"assert apartment2Engine.isError()assert apartment2Engine.getError() instanceof RuntimeExceptiondiff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovyindex 325c8d95a..4b79002df 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy@@ -1,6 +1,8 @@package org.openremote.test.rulesimport org.openremote.container.web.ClientRequestInfo+import org.openremote.manager.rules.RulesFacts+import org.openremote.manager.rules.RulesLoopExceptionimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.security.ManagerIdentityService@@ -233,12 +235,12 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerwhen: "a new tenant rule definition is added to Tenant A"ruleset = new TenantRuleset(- "Looping error", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicLoopingErrorRules.groovy").text,+ "Throw Failure Exception", GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text,keycloakDemoSetup.tenantA.realm,false,true)- rulesetStorageService.merge(ruleset)+ ruleset = rulesetStorageService.merge(ruleset)then: "the tenants A rule engine should run with one deployment as error"conditions.eventually {@@ -246,7 +248,30 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerassert tenantAEngine != nullassert tenantAEngine.isRunning()assert tenantAEngine.deployments.size() == 3- assert tenantAEngine.deployments.values().any({it.status == EXECUTION_ERROR})+ assert tenantAEngine.deployments[ruleset.id].status == EXECUTION_ERROR+ assert tenantAEngine.isError()+ }++ when: "a new tenant rule definition is added to Tenant A"+ ruleset = new TenantRuleset(+ "Looping error", GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text,+ keycloakDemoSetup.tenantA.realm,+ false,+ true+ )+ ruleset = rulesetStorageService.merge(ruleset)++ then: "the tenants A rule engine should have an error"+ conditions.eventually {+ tenantAEngine = rulesService.tenantEngines.get(keycloakDemoSetup.tenantA.realm)+ assert tenantAEngine != null+ assert !tenantAEngine.isRunning()+ assert tenantAEngine.deployments.size() == 4+ assert tenantAEngine.deployments[ruleset.id].status == EXECUTION_ERROR+ assert tenantAEngine.deployments[ruleset.id].error instanceof RulesLoopException+ assert tenantAEngine.deployments[ruleset.id].error.message == "Possible rules loop detected, exceeded max trigger count of " + RulesFacts.MAX_RULES_TRIGGERED_PER_EXECUTION + " for rule: Condition loops"+ assert tenantAEngine.isError()+ assert tenantAEngine.getError() instanceof RuntimeException}//TODO: Reinstate the tenant delete test once tenant delete mechanism is finaliseddiff --git a/test/src/test/resources/org/openremote/test/rules/BasicLoopingErrorRules.groovy b/test/src/test/resources/org/openremote/test/rules/BasicLoopingErrorRules.groovydeleted file mode 100644index 320d229e4..000000000--- a/test/src/test/resources/org/openremote/test/rules/BasicLoopingErrorRules.groovy+++ /dev/null@@ -1,17 +0,0 @@-package org.openremote.test.rules--import org.openremote.manager.rules.RulesBuilder--RulesBuilder rules = binding.rules--rules.add()- .name("Another radial location predicate")- .when(- { facts ->- true- })- .then(- { facts ->- facts.put("fired!")- })-