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
Rules logging sub category for each rule engine and ruleset (#1132)
Rich Turner2699cbc374a0
diff --git a/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.javaindex 8a020bc1e..000bc4569 100644--- a/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java@@ -4,34 +4,40 @@ import org.jeasy.rules.api.Rule;import org.jeasy.rules.core.RuleBuilder;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;-import org.openremote.manager.rules.facade.NotificationsFacade;-import org.openremote.manager.rules.flow.*;+import org.openremote.manager.rules.flow.NodeExecutionRequestInfo;+import org.openremote.manager.rules.flow.NodeModel;+import org.openremote.manager.rules.flow.NodeTriggerFunction;+import org.openremote.manager.rules.flow.NodeTriggerParameters;import org.openremote.model.rules.*;-import org.openremote.model.rules.flow.*;+import org.openremote.model.rules.flow.Node;+import org.openremote.model.rules.flow.NodeCollection;+import org.openremote.model.rules.flow.NodeSocket;+import org.openremote.model.rules.flow.NodeType;import java.util.*;-import java.util.stream.Collectors;+import java.util.logging.Logger;public class FlowRulesBuilder {- private AssetStorageService assetStorageService;- private Map<String, Long> triggerMap = new LinkedHashMap<>();- private List<NodeCollection> nodeCollections = new ArrayList<>();- private Assets assetsFacade;- private Users usersFacade;- private Notifications notificationFacade;- private HistoricDatapoints historicDatapointsFacade;- private PredictedDatapoints predictedDatapointsFacade;-- private TimerService timerService;+ protected final Logger LOG;+ protected final AssetStorageService assetStorageService;+ protected final Map<String, Long> triggerMap = new LinkedHashMap<>();+ protected final List<NodeCollection> nodeCollections = new ArrayList<>();+ protected final Assets assetsFacade;+ protected final Users usersFacade;+ protected final Notifications notificationFacade;+ protected final HistoricDatapoints historicDatapointsFacade;+ protected final PredictedDatapoints predictedDatapointsFacade;+ protected final TimerService timerService;public FlowRulesBuilder(- TimerService timerService,- AssetStorageService assetStorageService,- Assets assetsFacade,- Users usersFacade,- Notifications notificationFacade,- HistoricDatapoints historicDatapointsFacade,- PredictedDatapoints predictedDatapointsFacade) {+ Logger logger,+ TimerService timerService,+ AssetStorageService assetStorageService,+ Assets assetsFacade,+ Users usersFacade,+ Notifications notificationFacade,+ HistoricDatapoints historicDatapointsFacade,+ PredictedDatapoints predictedDatapointsFacade) {this.timerService = timerService;this.assetStorageService = assetStorageService;this.assetsFacade = assetsFacade;@@ -39,6 +45,7 @@ public class FlowRulesBuilder {this.notificationFacade = notificationFacade;this.historicDatapointsFacade = historicDatapointsFacade;this.predictedDatapointsFacade = predictedDatapointsFacade;+ LOG = logger;}public void add(NodeCollection nodeCollection) {@@ -52,11 +59,11 @@ public class FlowRulesBuilder {for (Node node : collection.getNodes()) {if (node.getType() != NodeType.OUTPUT) continue;try {- RulesEngine.RULES_LOG.fine("Flow rule created");+ LOG.fine("Flow rule created");rules.add(createRule(collection.getName() + " - " + count, collection, node));count++;} catch (Exception e) {- RulesEngine.RULES_LOG.severe("Flow rule error: " + e.getMessage());+ LOG.severe("Flow rule error: " + e.getMessage());}}}@@ -66,14 +73,9 @@ public class FlowRulesBuilder {private Rule createRule(String name, NodeCollection collection, Node outputNode) throws Exception {Object implementationResult = NodeModel.getImplementationFor(outputNode.getName()).execute(new NodeExecutionRequestInfo(collection, outputNode, null, null, assetsFacade, usersFacade, notificationFacade, historicDatapointsFacade, predictedDatapointsFacade));- if (implementationResult == null)- throw new NullPointerException(outputNode.getName() + " node returns null");-- if (!(implementationResult instanceof RulesBuilder.Action))+ if (!(implementationResult instanceof RulesBuilder.Action action))throw new Exception(outputNode.getName() + " node does not return an action");- RulesBuilder.Action action = (RulesBuilder.Action) implementationResult;-RulesBuilder.Condition condition = facts -> {List<Node> connectedTree = backtrackFrom(collection, outputNode);@@ -89,16 +91,14 @@ public class FlowRulesBuilder {name(name).description(collection.getDescription()).when(facts -> {- Object result;- try {- result = condition.evaluate((RulesFacts) facts);- } catch (Exception ex) {- throw new RuntimeException("Error evaluating condition of rule '" + name + "': " + ex.getMessage(), ex);- }+ Object result = condition.evaluate((RulesFacts) facts);+if (result instanceof Boolean) {return (boolean) result;} else {- throw new IllegalArgumentException("Error evaluating condition of rule '" + name + "': result is not boolean but " + result);+ String msg = "Error evaluating condition of rule, expected boolean but got " + (result != null ? result.getClass() : "null");+ LOG.warning(msg);+ throw new IllegalArgumentException(msg);}}).then(facts -> {@@ -113,7 +113,7 @@ public class FlowRulesBuilder {List<Node> children = new ArrayList<>();for (NodeSocket s : node.getInputs()) {- children.addAll(Arrays.stream(collection.getConnections()).filter(c -> c.getTo().equals(s.getId())).map(c -> collection.getNodeById(collection.getSocketById(c.getFrom()).getNodeId())).collect(Collectors.toList()));+ children.addAll(Arrays.stream(collection.getConnections()).filter(c -> c.getTo().equals(s.getId())).map(c -> collection.getNodeById(collection.getSocketById(c.getFrom()).getNodeId())).toList());}for (Node child : children) {diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex 5d8c1beb5..4781c6a03 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -58,12 +58,12 @@ import java.util.function.Function;import java.util.function.Predicate;import java.util.function.Supplier;import java.util.logging.Level;+import java.util.logging.Logger;import java.util.stream.Collectors;import java.util.stream.Stream;import static org.openremote.manager.rules.AssetQueryPredicate.groupIsEmpty;import static org.openremote.model.query.filter.LocationAttributePredicate.getLocationPredicates;-import static org.openremote.model.util.ValueUtil.LOG;import static org.openremote.model.util.ValueUtil.distinctByKey;public class JsonRulesBuilder extends RulesBuilder {@@ -540,8 +540,9 @@ public class JsonRulesBuilder extends RulesBuilder {final protected Map<String, RuleState> ruleStateMap = new HashMap<>();final protected JsonRule[] jsonRules;final protected Ruleset jsonRuleset;+ final protected Logger LOG;- public JsonRulesBuilder(Ruleset ruleset, TimerService timerService,+ public JsonRulesBuilder(Logger logger, Ruleset ruleset, TimerService timerService,AssetStorageService assetStorageService, ScheduledExecutorService executorService,Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, Webhooks webhooksFacade,HistoricDatapoints historicDatapoints, PredictedDatapoints predictedDatapoints,@@ -556,6 +557,7 @@ public class JsonRulesBuilder extends RulesBuilder {this.historicDatapointsFacade= historicDatapoints;this.predictedDatapointsFacade = predictedDatapoints;this.scheduledActionConsumer = scheduledActionConsumer;+ LOG = logger;jsonRuleset = ruleset;String rulesStr = ruleset.getRules();@@ -1024,7 +1026,7 @@ public class JsonRulesBuilder extends RulesBuilder {return null;}- private static String buildTriggeredAssetInfo(boolean useUnmatched, RuleState ruleEvaluationResult, boolean isHtml, boolean isJson) {+ private String buildTriggeredAssetInfo(boolean useUnmatched, RuleState ruleEvaluationResult, boolean isHtml, boolean isJson) {Set<String> assetIds = useUnmatched ? ruleEvaluationResult.otherwiseMatchedAssetIds : ruleEvaluationResult.thenMatchedAssetIds;@@ -1155,11 +1157,11 @@ public class JsonRulesBuilder extends RulesBuilder {}protected void log(Level level, String message) {- RulesEngine.RULES_LOG.log(level, LOG_PREFIX + jsonRuleset.getName() + "': " + message);+ LOG.log(level, LOG_PREFIX + jsonRuleset.getName() + "': " + message);}protected void log(Level level, String message, Throwable t) {- RulesEngine.RULES_LOG.log(level, LOG_PREFIX + jsonRuleset.getName() + "': " + message, t);+ LOG.log(level, LOG_PREFIX + jsonRuleset.getName() + "': " + message, t);}protected static SunTimes.Parameters getSunCalculator(Ruleset ruleset, SunPositionTrigger sunPositionTrigger, TimerService timerService) throws IllegalStateException {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex 3a6a899d4..067c4adec 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -43,6 +43,7 @@ import org.openremote.model.asset.Asset;import org.openremote.model.query.filter.GeofencePredicate;import org.openremote.model.query.filter.LocationAttributePredicate;import org.openremote.model.rules.*;+import org.openremote.model.syslog.SyslogCategory;import java.util.*;import java.util.concurrent.ConcurrentHashMap;@@ -91,10 +92,7 @@ public class RulesEngine<T extends Ruleset> {}}- public static final Logger LOG = Logger.getLogger(RulesEngine.class.getName());-- // Separate logger for execution of rules- public static final Logger RULES_LOG = Logger.getLogger("org.openremote.rules.Rules");+ protected final Logger LOG;// Separate logger for periodic stats printerpublic static final Logger STATS_LOG = Logger.getLogger("org.openremote.rules.RulesEngineStats");@@ -148,6 +146,10 @@ public class RulesEngine<T extends Ruleset> {this.assetStorageService = assetStorageService;this.clientEventService = clientEventService;this.id = id;++ String ruleEngineCategory = id.scope.getSimpleName().replace("Ruleset", "Engine-") + id.getId().orElse("");+ LOG = SyslogCategory.getLogger(SyslogCategory.RULES, RulesEngine.class.getName() + "." + ruleEngineCategory);+AssetsFacade<T> assetsFacade = new AssetsFacade<>(id, assetStorageService, attributeEvent -> {try {assetProcessingService.sendAttributeEvent(attributeEvent);@@ -163,7 +165,7 @@ public class RulesEngine<T extends Ruleset> {this.predictedFacade = new PredictedFacade<>(id, assetPredictedDatapointService);this.assetLocationPredicatesConsumer = assetLocationPredicatesConsumer;- this.facts = new RulesFacts(timerService, assetStorageService, assetsFacade, this, RULES_LOG);+ this.facts = new RulesFacts(timerService, assetStorageService, assetsFacade, this, LOG);engine = new DefaultRulesEngine(// Skip any other rules after the first failed rule (exception thrown in condition or action)new RulesEngineParameters(false, true, false, RulesEngineParameters.DEFAULT_RULE_PRIORITY_THRESHOLD)@@ -317,7 +319,7 @@ public class RulesEngine<T extends Ruleset> {return;}- LOG.info("Starting: " + this);+ LOG.info("Starting");running = true;trackLocationPredicates(true);@@ -330,9 +332,9 @@ public class RulesEngine<T extends Ruleset> {// Start a background stats printer if INFO level logging is enabledif (STATS_LOG.isLoggable(Level.FINE) || STATS_LOG.isLoggable(Level.FINEST)) {if (STATS_LOG.isLoggable(Level.FINEST)) {- LOG.info("On " + this + ", enabling periodic statistics output at FINEST level every 30 seconds on category: " + STATS_LOG.getName());+ LOG.info("Enabling periodic statistics output at FINEST level every 30 seconds on category: " + STATS_LOG.getName());} else {- LOG.info("On " + this + ", enabling periodic full memory dump at FINE level every 30 seconds on category: " + STATS_LOG.getName());+ LOG.info("Enabling periodic full memory dump at FINE level every 30 seconds on category: " + STATS_LOG.getName());}statsTimer = executorService.scheduleAtFixedRate(this::printSessionStats, 3, 30, TimeUnit.SECONDS);}@@ -358,7 +360,7 @@ public class RulesEngine<T extends Ruleset> {return;}running = false;- LOG.info("Stopping: " + this);+ LOG.info("Stopping");if (fireTimer != null) {fireTimer.cancel(true);fireTimer = null;@@ -419,7 +421,7 @@ public class RulesEngine<T extends Ruleset> {long fireTimeMillis = quickFire ? rulesService.quickFireMillis : rulesService.tempFactExpirationMillis;- LOG.finest("Scheduling rules firing in " + fireTimeMillis + "ms on: " + this);+ LOG.finest("Scheduling rules firing in " + fireTimeMillis + "ms");fireTimer = executorService.schedule(() -> {synchronized (RulesEngine.this) {@@ -457,9 +459,9 @@ public class RulesEngine<T extends Ruleset> {executionTotalMillis = (timerService.getCurrentTimeMillis() - executionTotalMillis);if (executionTotalMillis > 500) {- LOG.warning("Rules firing took " + executionTotalMillis + "ms on: " + this);+ LOG.warning("Rules firing took " + executionTotalMillis + "ms");} else {- LOG.fine("Rules firing took " + executionTotalMillis + "ms on: " + this);+ LOG.fine("Rules firing took " + executionTotalMillis + "ms");}}@@ -476,7 +478,7 @@ public class RulesEngine<T extends Ruleset> {// If full detail logging is enabled// Log asset states and events before firing- facts.logFacts(RULES_LOG, Level.FINEST);+ facts.logFacts(LOG, Level.FINEST);// Reset facts for this firing (loop detection etc.)facts.reset();@@ -489,7 +491,7 @@ public class RulesEngine<T extends Ruleset> {LOG.fine("Rules deployment '" + deployment.getName() + "' skipped as status is: " + status);}} catch (Exception ex) {- LOG.log(Level.SEVERE, "On " + RulesEngine.this + ", error executing rules of: " + deployment, ex);+ LOG.log(Level.SEVERE, "Error executing rules of: " + deployment, ex);deployment.setStatus(ex instanceof RulesLoopException ? LOOP_ERROR : EXECUTION_ERROR);deployment.setError(ex);diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngineId.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngineId.javaindex dbcdd49d6..d5a583047 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngineId.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngineId.java@@ -21,8 +21,8 @@ package org.openremote.manager.rules;import org.openremote.model.rules.AssetRuleset;import org.openremote.model.rules.GlobalRuleset;-import org.openremote.model.rules.Ruleset;import org.openremote.model.rules.RealmRuleset;+import org.openremote.model.rules.Ruleset;import java.util.Objects;import java.util.Optional;@@ -73,6 +73,10 @@ public class RulesEngineId<T extends Ruleset> {return Optional.ofNullable(assetId);}+ public Optional<String> getId() {+ return scope == RealmRuleset.class ? getRealm() : scope == AssetRuleset.class ? getAssetId() : Optional.empty();+ }+@Overridepublic boolean equals(Object o) {if (this == o) return true;diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.javaindex c1bb77360..bfd1ec8f3 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java@@ -36,6 +36,7 @@ import org.openremote.manager.asset.AssetStorageService;import org.openremote.model.calendar.CalendarEvent;import org.openremote.model.rules.*;import org.openremote.model.rules.flow.NodeCollection;+import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.Pair;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;@@ -53,34 +54,6 @@ import static org.openremote.model.rules.RulesetStatus.*;public class RulesetDeployment {- /**- * An interface that looks like a JavaScript browser console, for simplified logging.- */- public static class JsConsole {-- final protected Logger logger;-- public JsConsole(Logger logger) {- this.logger = logger;- }-- public void debug(Object o) {- logger.fine(o != null ? o.toString() : "null");- }-- public void log(Object o) {- logger.info(o != null ? o.toString() : "null");- }-- public void warn(Object o) {- logger.warning(o != null ? o.toString() : "null");- }-- public void error(Object o) {- logger.severe(o != null ? o.toString() : "null");- }- }-// TODO Finish groovy sandboxstatic class GroovyDenyAllFilter extends GroovyValueFilter {@Override@@ -92,19 +65,12 @@ public class RulesetDeployment {public static final int DEFAULT_RULE_PRIORITY = 1000;// Share one JS script engine manager, it's thread-safestatic final protected ScriptEngineManager scriptEngineManager;-static final protected GroovyShell groovyShell;static {scriptEngineManager = new ScriptEngineManager();- // LOG and console wrapper can be in global scope for all script engines- // TODO Use a different logger for each RulesEngine and show messages in Manager UI for that engine- scriptEngineManager.put("LOG", RulesEngine.RULES_LOG);- scriptEngineManager.put("console", new JsConsole(RulesEngine.RULES_LOG));-/* TODO Sharing a static GroovyShell doesn't work, redeploying a ruleset which defines classes (e.g. Flight) is broken:-java.lang.RuntimeException: Error evaluating condition of rule '-Update flight facts when estimated landing time of flight asset is updated':No signature of method: org.openremote.manager.setup.database.Script1$_run_closure2$_closure14$_closure17.doCall() is applicable for argument types: (org.openremote.manager.setup.database.Flight) values: [...]Possible solutions: doCall(org.openremote.manager.setup.database.Flight), findAll(), findAll(), isCase(java.lang.Object), isCase(java.lang.Object)@@ -132,6 +98,7 @@ public class RulesetDeployment {final protected HistoricDatapoints historicDatapointsFacade;final protected PredictedDatapoints predictedDatapointsFacade;final protected List<ScheduledFuture<?>> scheduledRuleActions = Collections.synchronizedList(new ArrayList<>());+ protected final Logger LOG;protected boolean running;protected RulesetStatus status = RulesetStatus.READY;protected Throwable error;@@ -154,6 +121,9 @@ public class RulesetDeployment {this.webhooksFacade = webhooksFacade;this.historicDatapointsFacade = historicDatapointsFacade;this.predictedDatapointsFacade = predictedDatapointsFacade;++ String ruleCategory = ruleset.getClass().getSimpleName() + "-" + ruleset.getId();+ LOG = SyslogCategory.getLogger(SyslogCategory.RULES, Ruleset.class.getName() + "." + ruleCategory);}protected void init() throws IllegalStateException {@@ -161,25 +131,25 @@ public class RulesetDeployment {validity = ruleset.getValidity();if (validity == null) {- RulesEngine.LOG.log(Level.WARNING, "Ruleset '" + ruleset.getName() + "' has invalid validity value: " + ruleset.getMeta().get(Ruleset.VALIDITY));+ LOG.log(Level.WARNING, "Ruleset '" + ruleset.getName() + "' has invalid validity value: " + ruleset.getMeta().get(Ruleset.VALIDITY));status = VALIDITY_PERIOD_ERROR;return;}}if (TextUtil.isNullOrEmpty(ruleset.getRules())) {- RulesEngine.LOG.finest("Ruleset is empty so no rules to deploy: " + ruleset.getName());+ LOG.finest("Ruleset is empty so no rules to deploy: " + ruleset.getName());status = EMPTY;return;}if (!ruleset.isEnabled()) {- RulesEngine.LOG.finest("Ruleset is disabled: " + ruleset.getName());+ LOG.finest("Ruleset is disabled: " + ruleset.getName());status = DISABLED;}if (!compile()) {- RulesEngine.LOG.log(Level.SEVERE, "Ruleset compilation error: " + ruleset.getName(), getError());+ LOG.log(Level.SEVERE, "Ruleset compilation error: " + ruleset.getName(), getError());status = COMPILATION_ERROR;}}@@ -208,10 +178,10 @@ public class RulesetDeployment {Pair<Long, Long> fromTo = validity.getNextOrActiveFromTo(new Date(timerService.getCurrentTimeMillis()));if (fromTo == null) {nextValidity = EXPIRED;- RulesEngine.LOG.log(Level.INFO, "Ruleset deployment '" + getName() + "' has expired");+ LOG.log(Level.INFO, "Ruleset deployment '" + getName() + "' has expired");} else {nextValidity = fromTo;- RulesEngine.LOG.log(Level.INFO, "Ruleset deployment '" + getName() + "' paused until: " + new Date(fromTo.key));+ LOG.log(Level.INFO, "Ruleset deployment '" + getName() + "' paused until: " + new Date(fromTo.key));}}@@ -236,7 +206,7 @@ public class RulesetDeployment {}public boolean compile() {- RulesEngine.LOG.info("Compiling ruleset deployment: " + ruleset);+ LOG.info("Compiling ruleset deployment: " + ruleset);if (error != null) {return false;}@@ -316,10 +286,10 @@ public class RulesetDeployment {protected boolean compileRulesJson(Ruleset ruleset) {try {- jsonRulesBuilder = new JsonRulesBuilder(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationsFacade, webhooksFacade, historicDatapointsFacade, predictedDatapointsFacade, this::scheduleRuleAction);+ jsonRulesBuilder = new JsonRulesBuilder(LOG, ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationsFacade, webhooksFacade, historicDatapointsFacade, predictedDatapointsFacade, this::scheduleRuleAction);for (Rule rule : jsonRulesBuilder.build()) {- RulesEngine.LOG.finest("Registering JSON rule: " + rule.getName());+ LOG.finest("Registering JSON rule: " + rule.getName());rules.register(rule);}@@ -336,7 +306,7 @@ public class RulesetDeployment {ScriptContext newContext = new SimpleScriptContext();newContext.setBindings(scriptEngine.createBindings(), ScriptContext.ENGINE_SCOPE);Bindings engineScope = newContext.getBindings(ScriptContext.ENGINE_SCOPE);-+ engineScope.put("LOG", LOG);engineScope.put("assets", assetsFacade);engineScope.put("users", usersFacade);engineScope.put("notifications", notificationsFacade);@@ -465,7 +435,7 @@ public class RulesetDeployment {throw new IllegalArgumentException("Defined 'then' is not a function in rule: " + name);}- RulesEngine.LOG.finest("Registering javascript rule: " + name);+ LOG.finest("Registering javascript rule: " + name);rules.register(new RuleBuilder().name(name).description(description).priority(priority).when(when).then(then).build()@@ -480,7 +450,7 @@ public class RulesetDeployment {Script script = groovyShell.parse(ruleset.getRules());Binding binding = new Binding();RulesBuilder rulesBuilder = new RulesBuilder();- binding.setVariable("LOG", RulesEngine.RULES_LOG);+ binding.setVariable("LOG", LOG);binding.setVariable("rules", rulesBuilder);binding.setVariable("assets", assetsFacade);binding.setVariable("users", usersFacade);@@ -499,7 +469,7 @@ public class RulesetDeployment {script.setBinding(binding);script.run();for (Rule rule : rulesBuilder.build()) {- RulesEngine.LOG.finest("Registering groovy rule: " + rule.getName());+ LOG.finest("Registering groovy rule: " + rule.getName());rules.register(rule);}@@ -513,16 +483,16 @@ public class RulesetDeployment {protected boolean compileRulesFlow(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, HistoricDatapoints historicDatapointsFacade, PredictedDatapoints predictedDatapointsFacade) {try {- flowRulesBuilder = new FlowRulesBuilder(timerService, assetStorageService, assetsFacade, usersFacade, notificationsFacade, historicDatapointsFacade, predictedDatapointsFacade);+ flowRulesBuilder = new FlowRulesBuilder(LOG, timerService, assetStorageService, assetsFacade, usersFacade, notificationsFacade, historicDatapointsFacade, predictedDatapointsFacade);NodeCollection nodeCollection = ValueUtil.JSON.readValue(ruleset.getRules(), NodeCollection.class);flowRulesBuilder.add(nodeCollection);for (Rule rule : flowRulesBuilder.build()) {- RulesEngine.LOG.info("Compiling flow rule: " + rule.getName());+ LOG.info("Compiling flow rule: " + rule.getName());rules.register(rule);}return true;} catch (Exception e) {- RulesEngine.LOG.log(Level.SEVERE, "Error evaluating flow rule ruleset: " + ruleset, e);+ LOG.log(Level.SEVERE, "Error evaluating flow rule ruleset: " + ruleset, e);setError(e);return false;}diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/WebhooksFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/WebhooksFacade.javaindex 8a8869257..cf253c172 100644--- a/manager/src/main/java/org/openremote/manager/rules/facade/WebhooksFacade.java+++ b/manager/src/main/java/org/openremote/manager/rules/facade/WebhooksFacade.java@@ -39,8 +39,8 @@ public class WebhooksFacade<T extends Ruleset> extends Webhooks {}@Override- public void send(Webhook webhook, MediaType mediaType, WebTarget target) {- webhookService.sendHttpRequest(webhook, mediaType, target);+ public boolean send(Webhook webhook, MediaType mediaType, WebTarget target) {+ return webhookService.sendHttpRequest(webhook, mediaType, target);}@Overridediff --git a/manager/src/main/java/org/openremote/manager/rules/flow/NodeImplementation.java b/manager/src/main/java/org/openremote/manager/rules/flow/NodeImplementation.javaindex 7de6d544e..74c2a5766 100644--- a/manager/src/main/java/org/openremote/manager/rules/flow/NodeImplementation.java+++ b/manager/src/main/java/org/openremote/manager/rules/flow/NodeImplementation.java@@ -1,6 +1,6 @@package org.openremote.manager.rules.flow;public interface NodeImplementation {- Object execute(NodeExecutionRequestInfo info);+ Object execute(NodeExecutionRequestInfo info) throws RuntimeException;}diff --git a/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java b/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.javaindex 1935f01b6..f9524bad7 100644--- a/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java+++ b/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java@@ -1,7 +1,6 @@package org.openremote.manager.rules.flow;import org.openremote.manager.rules.RulesBuilder;-import org.openremote.manager.rules.RulesEngine;import org.openremote.model.query.AssetQuery;import org.openremote.model.rules.AssetState;import org.openremote.model.rules.flow.*;@@ -10,7 +9,6 @@ import org.openremote.model.util.ValueUtil;import java.util.List;import java.util.Objects;import java.util.Optional;-import java.util.stream.Collectors;public enum NodeModel {READ_ATTRIBUTE(@@ -25,15 +23,14 @@ public enum NodeModel {String assetId = assetAttributePair.getAssetId();String attributeName = assetAttributePair.getAttributeName();Optional<AssetState<?>> readValue = info.getFacts().matchFirstAssetState(new AssetQuery().ids(assetId).attributeName(attributeName));- if (!readValue.isPresent()) return null;- return readValue.get().getValue().orElse(null);+ return readValue.<Object>map(assetState -> assetState.getValue().orElse(null)).orElse(null);},params -> {AttributeInternalValue internal = ValueUtil.JSON.convertValue(params.getNode().getInternals()[0].getValue(), AttributeInternalValue.class);String assetId = internal.getAssetId();String attributeName = internal.getAttributeName();List<AssetState<?>> allAssets = params.getFacts().matchAssetState(new AssetQuery().ids(assetId).attributeName(attributeName)- ).collect(Collectors.toList());+ ).toList();return allAssets.stream().anyMatch(state -> {long timestamp = state.getTimestamp();@@ -53,7 +50,6 @@ public enum NodeModel {info.setFacts(facts);Object value = info.getValueFromInput(0);if (value == null) {- RulesEngine.LOG.warning("Flow rule error: node " + info.getNode().getName() + " receives invalid value");return;}AttributeInternalValue assetAttributePair = ValueUtil.JSON.convertValue(info.getInternals()[0].getValue(), AttributeInternalValue.class);@@ -88,14 +84,9 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.BOOLEAN),}),info -> {- try {- boolean a = (boolean) info.getValueFromInput(0);- boolean b = (boolean) info.getValueFromInput(1);- return a && b;- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return false;- }+ boolean a = (boolean) info.getValueFromInput(0);+ boolean b = (boolean) info.getValueFromInput(1);+ return a && b;}),OR_GATE(new Node(NodeType.PROCESSOR, "∥", new NodeInternal[0], new NodeSocket[]{@@ -105,14 +96,9 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.BOOLEAN),}),info -> {- try {- boolean a = (boolean) info.getValueFromInput(0);- boolean b = (boolean) info.getValueFromInput(1);- return a || b;- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return false;- }+ boolean a = (boolean) info.getValueFromInput(0);+ boolean b = (boolean) info.getValueFromInput(1);+ return a || b;}),NOT_GATE(new Node(NodeType.PROCESSOR, "!", new NodeInternal[0], new NodeSocket[]{@@ -121,13 +107,8 @@ public enum NodeModel {new NodeSocket("o", NodeDataType.BOOLEAN),}),info -> {- try {- boolean a = (boolean) info.getValueFromInput(0);- return !a;- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return true;- }+ boolean a = (boolean) info.getValueFromInput(0);+ return !a;}),NUMBER_INPUT(new Node(NodeType.INPUT, new NodeInternal[]{@@ -135,14 +116,7 @@ public enum NodeModel {}, new NodeSocket[0], new NodeSocket[]{new NodeSocket("value", NodeDataType.NUMBER)}),- info -> {- try {- return ValueUtil.convert(info.getInternals()[0].getValue(), Double.class);- } catch (IllegalArgumentException e) {- RulesEngine.RULES_LOG.warning("Number node returned invalid value");- return 0f;- }- }),+ info -> ValueUtil.convert(info.getInternals()[0].getValue(), Double.class)),ADD_OPERATOR(new Node(NodeType.PROCESSOR, "+", new NodeInternal[0], new NodeSocket[]{new NodeSocket("a", NodeDataType.NUMBER),@@ -151,14 +125,9 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.NUMBER),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);- Number b = (Number) info.getValueFromInput(1);- return a.doubleValue() + b.doubleValue();- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;- }+ Number a = (Number) info.getValueFromInput(0);+ Number b = (Number) info.getValueFromInput(1);+ return a != null && b != null ? a.doubleValue() + b.doubleValue() : null;}),SUBTRACT_OPERATOR(new Node(NodeType.PROCESSOR, "-", new NodeInternal[0], new NodeSocket[]{@@ -168,14 +137,9 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.NUMBER),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);- Number b = (Number) info.getValueFromInput(1);- return a.doubleValue() - b.doubleValue();- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;- }+ Number a = (Number) info.getValueFromInput(0);+ Number b = (Number) info.getValueFromInput(1);+ return a != null && b != null ? a.doubleValue() - b.doubleValue() : null;}),MULTIPLY_OPERATOR(new Node(NodeType.PROCESSOR, "×", new NodeInternal[0], new NodeSocket[]{@@ -185,14 +149,9 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.NUMBER),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);- Number b = (Number) info.getValueFromInput(1);- return a.doubleValue() * b.doubleValue();- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;- }+ Number a = (Number) info.getValueFromInput(0);+ Number b = (Number) info.getValueFromInput(1);+ return a != null && b != null ? a.doubleValue() * b.doubleValue() : null;}),DIVIDE_OPERATOR(new Node(NodeType.PROCESSOR, "÷", new NodeInternal[0], new NodeSocket[]{@@ -202,18 +161,17 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.NUMBER),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);- Number b = (Number) info.getValueFromInput(1);-- if (b.doubleValue() == 0d)- return 0d;+ Number a = (Number) info.getValueFromInput(0);+ Number b = (Number) info.getValueFromInput(1);- return a.doubleValue() / b.doubleValue();- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;+ if (a == null || b == null) {+ return null;}++ if (b.doubleValue() == 0d)+ return 0d;++ return a.doubleValue() / b.doubleValue();}),EQUALS_COMPARATOR(new Node(NodeType.PROCESSOR, "=", new NodeInternal[0], new NodeSocket[]{@@ -223,14 +181,9 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.BOOLEAN),}),info -> {- try {- Object a = info.getValueFromInput(0);- Object b = info.getValueFromInput(1);- return a.equals(b);- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return false;- }+ Object a = info.getValueFromInput(0);+ Object b = info.getValueFromInput(1);+ return a != null && b != null && Objects.equals(a, b);}),GREATER_THAN(new Node(NodeType.PROCESSOR, ">", new NodeInternal[0], new NodeSocket[]{@@ -240,14 +193,9 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.BOOLEAN),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);- Number b = (Number) info.getValueFromInput(1);- return a.doubleValue() > b.doubleValue();- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return false;- }+ Number a = (Number) info.getValueFromInput(0);+ Number b = (Number) info.getValueFromInput(1);+ return a != null && b != null && a.doubleValue() > b.doubleValue();}),LESS_THAN(new Node(NodeType.PROCESSOR, "<", new NodeInternal[0], new NodeSocket[]{@@ -257,14 +205,9 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.BOOLEAN),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);- Number b = (Number) info.getValueFromInput(1);- return a.doubleValue() < b.doubleValue();- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return false;- }+ Number a = (Number) info.getValueFromInput(0);+ Number b = (Number) info.getValueFromInput(1);+ return a != null && b != null && a.doubleValue() < b.doubleValue();}),ROUND_NODE(new Node(NodeType.PROCESSOR, new NodeInternal[]{@@ -279,22 +222,18 @@ public enum NodeModel {new NodeSocket("value", NodeDataType.NUMBER),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);+ Number a = (Number) info.getValueFromInput(0);- switch ((String) info.getInternals()[0].getValue()) {- case "round":- return Math.round(a.doubleValue());- case "ceil":- return Math.ceil(a.doubleValue());- case "floor":- return Math.floor(a.doubleValue());- }- return a;- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;+ if (a == null) {+ return null;}++ return switch ((String) info.getInternals()[0].getValue()) {+ case "round" -> Math.round(a.doubleValue());+ case "ceil" -> Math.ceil(a.doubleValue());+ case "floor" -> Math.floor(a.doubleValue());+ default -> a;+ };}),ABS_OPERATOR(new Node(NodeType.PROCESSOR, "|x|", new NodeInternal[0], new NodeSocket[]{@@ -303,13 +242,8 @@ public enum NodeModel {new NodeSocket("absolute", NodeDataType.NUMBER),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);- return Math.abs(a.doubleValue());- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;- }+ Number a = (Number) info.getValueFromInput(0);+ return a != null ? Math.abs(a.doubleValue()) : null;}),POW_OPERATOR(new Node(NodeType.PROCESSOR, "^", new NodeInternal[0], new NodeSocket[]{@@ -319,14 +253,9 @@ public enum NodeModel {new NodeSocket("value", NodeDataType.NUMBER),}),info -> {- try {- Number a = (Number) info.getValueFromInput(0);- Number b = (Number) info.getValueFromInput(1);- return Math.pow(a.doubleValue(), b.doubleValue());- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;- }+ Number a = (Number) info.getValueFromInput(0);+ Number b = (Number) info.getValueFromInput(1);+ return a != null && b != null ? Math.pow(a.doubleValue(), b.doubleValue()) : null;}),NUMBER_SWITCH(new Node(NodeType.PROCESSOR, new NodeInternal[0], new NodeSocket[]{@@ -337,17 +266,12 @@ public enum NodeModel {new NodeSocket("output", NodeDataType.NUMBER),}),info -> {- try {- boolean condition = ValueUtil.convert(info.getValueFromInput(0), Boolean.class);+ boolean condition = ValueUtil.convert(info.getValueFromInput(0), Boolean.class);- Number a = (Number) info.getValueFromInput(1);- Number b = (Number) info.getValueFromInput(2);+ Number a = (Number) info.getValueFromInput(1);+ Number b = (Number) info.getValueFromInput(2);- return condition ? a.doubleValue() : b.doubleValue();- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;- }+ return condition ? (a != null ? a.doubleValue() : null) : (b != null ? b.doubleValue() : null);}),TEXT_INPUT(new Node(NodeType.INPUT, new NodeInternal[]{@@ -357,9 +281,8 @@ public enum NodeModel {}),info -> {Object value = info.getInternals()[0].getValue();- if (value == null) return "";- if (!(value instanceof String)) return "";- return value;+ if (!(value instanceof CharSequence charSequence)) return null;+ return charSequence.toString();}),COMBINE_TEXT(new Node(NodeType.PROCESSOR, new NodeInternal[]{@@ -371,17 +294,12 @@ public enum NodeModel {new NodeSocket("c", NodeDataType.STRING),}),info -> {- try {- Object joiner = ValueUtil.convert(info.getInternals()[0].getValue(), String.class);- Object a = ValueUtil.convert(info.getValueFromInput(0), String.class);- Object b = ValueUtil.convert(info.getValueFromInput(1), String.class);+ Object joiner = ValueUtil.convert(info.getInternals()[0].getValue(), String.class);+ Object a = ValueUtil.convert(info.getValueFromInput(0), String.class);+ Object b = ValueUtil.convert(info.getValueFromInput(1), String.class);- joiner = joiner == null ? "" : joiner;- return "" + a + joiner + b;- } catch (Exception e) {- RulesEngine.LOG.warning("Flow rule processing error: " + e.getMessage());- return 0;- }+ joiner = joiner == null ? "" : joiner;+ return "" + (a != null ? a : "") + joiner + (b != null ? b : "");}),TEXT_SWITCH(new Node(NodeType.PROCESSOR, new NodeInternal[0], new NodeSocket[]{@@ -406,7 +324,7 @@ public enum NodeModel {info -> {try {Number a = (Number) info.getValueFromInput(0);- return Math.sin(a.doubleValue());+ return a != null ? Math.sin(a.doubleValue()) : null;} catch (Exception e) {return 0;}@@ -419,7 +337,7 @@ public enum NodeModel {}),info -> {Number a = (Number) info.getValueFromInput(0);- return Math.cos(a.doubleValue());+ return a != null ? Math.cos(a.doubleValue()) : null;}),TAN(new Node(NodeType.PROCESSOR, "tan", new NodeInternal[0], new NodeSocket[]{@@ -430,7 +348,7 @@ public enum NodeModel {info -> {try {Number a = (Number) info.getValueFromInput(0);- return Math.tan(a.doubleValue());+ return a != null ? Math.tan(a.doubleValue()) : null;} catch (Exception e) {return 0;}@@ -444,7 +362,7 @@ public enum NodeModel {info -> {try {Number a = (Number) info.getValueFromInput(0);- return Math.sqrt(a.doubleValue());+ return a != null ? Math.sqrt(a.doubleValue()) : null;} catch (Exception e) {return 0;}@@ -460,7 +378,7 @@ public enum NodeModel {try {Number a = (Number) info.getValueFromInput(0);Number b = (Number) info.getValueFromInput(1);- return a.doubleValue() % b.doubleValue();+ return a != null && b != null ? a.doubleValue() % b.doubleValue() : null;} catch (Exception e) {return 0;}diff --git a/manager/src/main/java/org/openremote/manager/webhook/WebhookService.java b/manager/src/main/java/org/openremote/manager/webhook/WebhookService.javaindex 03bca2878..5984b3010 100644--- a/manager/src/main/java/org/openremote/manager/webhook/WebhookService.java+++ b/manager/src/main/java/org/openremote/manager/webhook/WebhookService.java@@ -19,22 +19,21 @@*/package org.openremote.manager.webhook;+import jakarta.ws.rs.ProcessingException;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.camel.builder.RouteBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;import org.openremote.container.web.WebTargetBuilder;-import org.openremote.manager.rules.RulesEngine;import org.openremote.model.Container;import org.openremote.model.ContainerService;import org.openremote.model.http.HTTPMethod;import org.openremote.model.webhook.Webhook;-import jakarta.ws.rs.ProcessingException;-import jakarta.ws.rs.client.Entity;-import jakarta.ws.rs.client.WebTarget;-import jakarta.ws.rs.core.MediaType;-import jakarta.ws.rs.core.Response;import java.net.URI;import java.util.concurrent.TimeUnit;import java.util.logging.Logger;@@ -84,22 +83,18 @@ public class WebhookService extends RouteBuilder implements ContainerService {// empty}- public void sendHttpRequest(Webhook webhook, MediaType mediaType, WebTarget target) {- Response response = null;- try {- response = this.buildRequest(target, webhook.getHttpMethod(), mediaType, webhook.getPayload());+ public boolean sendHttpRequest(Webhook webhook, MediaType mediaType, WebTarget target) {+ try (Response response = this.buildRequest(target, webhook.getHttpMethod(), mediaType, webhook.getPayload())) {if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {- RulesEngine.LOG.warning("Webhook request responded with error " + response.getStatus() + ": " + response.getStatusInfo().getReasonPhrase());+ LOG.warning("Webhook request responded with error " + response.getStatus() + ": " + response.getStatusInfo().getReasonPhrase());} else {- RulesEngine.LOG.info("Webhook request executed successfully with response status " + response.getStatus());+ LOG.info("Webhook request executed successfully with response status " + response.getStatus());+ return true;}} catch (Exception e) {LOG.warning(e.getMessage());- } finally {- if (response != null) {- response.close();- }}+ return false;}public WebTarget buildWebTarget(Webhook webhook) {diff --git a/model/src/main/java/org/openremote/model/rules/Webhooks.java b/model/src/main/java/org/openremote/model/rules/Webhooks.javaindex fc543228f..de9b5cc03 100644--- a/model/src/main/java/org/openremote/model/rules/Webhooks.java+++ b/model/src/main/java/org/openremote/model/rules/Webhooks.java@@ -28,6 +28,6 @@ import jakarta.ws.rs.core.MediaType;@TsIgnorepublic abstract class Webhooks {- public abstract void send(Webhook webhook, MediaType mediaType, WebTarget target);+ public abstract boolean send(Webhook webhook, MediaType mediaType, WebTarget target);public abstract WebTarget buildTarget(Webhook webhook);}diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java b/model/src/main/java/org/openremote/model/syslog/SyslogEvent.javaindex 2297c58e6..9f6751cbb 100644--- a/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java+++ b/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java@@ -19,12 +19,11 @@*/package org.openremote.model.syslog;-import org.openremote.model.Constants;+import jakarta.persistence.*;+import jakarta.validation.constraints.NotNull;import org.openremote.model.event.shared.EventFilter;import org.openremote.model.event.shared.SharedEvent;-import jakarta.persistence.*;-import jakarta.validation.constraints.NotNull;import java.util.*;import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesFactsTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesFactsTest.groovyindex ac287a0cb..e85428a18 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesFactsTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesFactsTest.groovy@@ -2,11 +2,10 @@ package org.openremote.test.rulesimport groovy.transform.EqualsAndHashCodeimport groovy.transform.ToString-import org.openremote.container.Containerimport org.openremote.container.timer.TimerServiceimport org.openremote.manager.asset.AssetStorageService-import org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesFacts+import org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.facade.AssetsFacadeimport spock.lang.Specification@@ -51,7 +50,7 @@ class BasicRulesFactsTest extends Specification {def assetStorageService = new AssetStorageService()timerService.clock = TimerService.Clock.PSEUDOtimerService.clock.stop()- rulesFacts = new RulesFacts(timerService, assetStorageService, assetsFacade, this, RulesEngine.RULES_LOG)+ rulesFacts = new RulesFacts(timerService, assetStorageService, assetsFacade, this, RulesService.LOG)}def "Handle named facts"() {diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.tsindex b0cb86e40..d4fcc1ee7 100644--- a/ui/component/or-rules/src/or-rule-viewer.ts+++ b/ui/component/or-rules/src/or-rule-viewer.ts@@ -9,7 +9,7 @@ import {RuleView,RuleViewInfoMap} from "./index";-import {ClientRole, RulesetUnion} from "@openremote/model";+import {ClientRole, RulesetStatus, RulesetUnion} from "@openremote/model";import manager, {Util} from "@openremote/core";import "./json-viewer/or-rule-json-viewer";import "./or-rule-text-viewer";@@ -68,6 +68,16 @@ export const style = css`display: flex;align-items: center;}++ #rule-status {+ flex: 1;+ text-align: center;+ }++ #rule-id {+ min-width: 70px;+ margin-right: 10px;+ }#rule-header-controls > * {margin: 0 10px;@@ -165,10 +175,11 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {return html`<div id="main-wrapper" class="wrapper"><div id="rule-header">+ <h3 id="rule-id">${this.ruleset.id ? "ID: " + this.ruleset.id : ""}</h3><or-mwc-input id="rule-name" outlined .type="${InputType.TEXT}" .label="${i18next.t("ruleName")}" ?focused="${this._focusName}" .value="${this.ruleset ? this.ruleset.name : null}" ?disabled="${this._isReadonly()}" required minlength="3" maxlength="255" @or-mwc-input-changed="${(e: OrInputChangedEvent) => this._changeName(e.detail.value)}"></or-mwc-input><or-rule-validity id="rule-header-validity" .ruleset="${this.ruleset}"></or-rule-validity>+ ${this.ruleset.status ? html`<span id="rule-status" title="${this.ruleset.error}">${i18next.t("status") + ": " + this.ruleset.status}</span>` : ``}<div id="rule-header-controls">- <span id="rule-status" title="${this.ruleset.error}">${this.ruleset.status == ("LOOP_ERROR" || "COMPILATION_ERROR" || "EXECUTION_ERROR") ? this.ruleset.status : ""}</span><span id="active-wrapper"><or-translate value="enabled"></or-translate><or-mwc-input .type="${InputType.SWITCH}" .value="${this.ruleset && this.ruleset.enabled}" ?disabled="${!this.ruleset.id}" @or-mwc-input-changed="${this._toggleEnabled}"></or-mwc-input>diff --git a/ui/util/cli.js b/ui/util/cli.jsindex 94450e143..5ef300cbc 100755--- a/ui/util/cli.js+++ b/ui/util/cli.js@@ -51,5 +51,8 @@ if (process.argv.length >= 3 && process.argv[2] =="watch") {shell: true});console.log("gradlew modelWatch finished! Status = " + gradleModelWatch.status);+ if (gradleModelWatch.stderr) {+ console.log(gradleModelWatch.stderr.toString());+ }process.exit(gradleModelWatch.status);}