Merge pull request #160 from iot-dsa-v2/develop

0.70.5

Author: d-shapiro

build.gradle

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

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

@@ -67,7 +67,7 @@ protected void write(LogRecord record) {
             	String recordMsg = encodeLogRecord(record);
                 DSDateTime ts = DSDateTime.valueOf(record.getMillis());
                 if (levelMatches(recordLevel, level.toLevel()) && 
-                        (name == null || name.isEmpty() || name.equals(recordName)) &&
+                        (name == null || name.isEmpty() || logNameMatches(recordName, name)) &&
                         (filter == null || filter.isEmpty() || recordMsg.matches(filter))) {
 
                     while (lines.size() > 1000) {
@@ -158,6 +158,10 @@ private static String encodeLogRecord(LogRecord record) {
     public static boolean levelMatches(Level msgLevel, Level desiredLevel) {
         return msgLevel.intValue() >= desiredLevel.intValue();
     }
+    
+    public static boolean logNameMatches(String msgLogName, String desiredLogName) {
+        return msgLogName != null && msgLogName.startsWith(desiredLogName);
+    }
 
     static {
         levelRange = new DSList();