0.70.6

improvement to log streaming actions - allow regex filter to match part
of log message

Author: d-shapiro

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.70.5'
+    version '0.70.6'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/logging/StreamableLogNode.java

@@ -8,6 +8,7 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 import org.iot.dsa.dslink.Action.ResultsType;
 import org.iot.dsa.dslink.ActionResults;
 import org.iot.dsa.logging.DSLevel;
@@ -68,7 +69,7 @@ protected void write(LogRecord record) {
                 DSDateTime ts = DSDateTime.valueOf(record.getMillis());
                 if (levelMatches(recordLevel, level.toLevel()) && 
                         (name == null || name.isEmpty() || logNameMatches(recordName, name)) &&
-                        (filter == null || filter.isEmpty() || recordMsg.matches(filter))) {
+                        (filter == null || filter.isEmpty() || logTextMatches(recordMsg, filter))) {
 
                     while (lines.size() > 1000) {
                         lines.remove(0);
@@ -162,6 +163,11 @@ public static boolean levelMatches(Level msgLevel, Level desiredLevel) {
     public static boolean logNameMatches(String msgLogName, String desiredLogName) {
         return msgLogName != null && msgLogName.startsWith(desiredLogName);
     }
+    
+    public static boolean logTextMatches(String text, String filter) {
+        Pattern p = Pattern.compile(filter);
+        return p.matcher(text).find();
+    }
 
     static {
         levelRange = new DSList();