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
Fix for RulesFired log category
Rich Turner33831d013704
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex 94de15e41..1f51cb760 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -37,6 +37,7 @@ import org.openremote.model.attribute.MetaItemType;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 org.openremote.model.util.TextUtil;import java.util.*;@@ -79,7 +80,7 @@ public class RulesEngine<T extends Ruleset> {public static final Logger RULES_LOG = Logger.getLogger("org.openremote.rules.Rules");// Separate logger for fired rules- public static final Logger RULES_FIRED_LOG = Logger.getLogger("org.openremote.rules.RulesFired");+ public static final Logger RULES_FIRED_LOG = SyslogCategory.getLogger(SyslogCategory.RULES, "org.openremote.rules.RulesFired");// Separate logger for periodic stats printerpublic static final Logger STATS_LOG = Logger.getLogger("org.openremote.rules.RulesEngineStats");@@ -548,7 +549,7 @@ public class RulesEngine<T extends Ruleset> {Collection<Object> anonFacts = facts.getAnonymousFacts();long temporaryFactsCount = facts.getTemporaryFacts().count();long total = assetStateFacts.size() + assetEventFacts.size() + namedFacts.size() + anonFacts.size();- STATS_LOG.info("On " + this + ", in memory facts are Total: " + total+ STATS_LOG.fine("Engine stats for '" + this + "', in memory facts are Total: " + total+ ", AssetState: " + assetStateFacts.size()+ ", AssetEvent: " + assetEventFacts.size()+ ", Named: " + namedFacts.size()diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java b/model/src/main/java/org/openremote/model/syslog/SyslogCategory.javaindex e3cace62c..19e326b2d 100644--- a/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java+++ b/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java@@ -44,7 +44,7 @@ public enum SyslogCategory {),RULES("Rules",- false,+ true,"RulesService","RulesEngine","RuleExecutionLogger",