svn commit: r1853224 - in /felix/trunk/healthcheck: api/src/main/java/org/apache/felix/hc/api/ api/src/test/java/org/apache/felix/hc/api/ core/src/main/java/org/apache/felix/hc/jmx/impl/

[ghenzler]

Author: ghenzler
Date: Fri Feb  8 14:44:58 2019
New Revision: 1853224

URL: http://svn.apache.org/viewvc?rev=1853224&view=rev
Log:
FELIX-6053 Ensure JMX bean shows DEBUG/INFO(=OK) correctly 

Modified:
    
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/ResultLog.java
    
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultLogTest.java
    
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultTest.java
    
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/jmx/impl/HealthCheckMBean.java

Modified: 
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/ResultLog.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/ResultLog.java?rev=1853224&r1=1853223&r2=1853224&view=diff
==============================================================================
--- 
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/ResultLog.java
 (original)
+++ 
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/ResultLog.java
 Fri Feb  8 14:44:58 2019
@@ -40,7 +40,7 @@ public class ResultLog implements Iterab
         public Entry(Status s, String message) {
             this(s, message, false, null);
         }
-
+        
         public Entry(String message, boolean isDebug) {
             this(Status.OK, message, isDebug, null);
         }
@@ -62,7 +62,7 @@ public class ResultLog implements Iterab
 
         @Override
         public String toString() {
-            StringBuilder builder = new StringBuilder(isDebug 
?"DEBUG":status.toString()).append(" ").append(message);
+            StringBuilder builder = new StringBuilder(getLogLevel()).append(" 
").append(message);
             if (exception != null) {
                 builder.append(" Exception: " + exception.getMessage());
             }
@@ -73,6 +73,15 @@ public class ResultLog implements Iterab
             return status;
         }
 
+        public String getLogLevel() {
+            switch (status) {
+            case OK:
+                return isDebug ? "DEBUG" : "INFO";
+            default:
+                return status.toString();
+            }
+        }
+
         public String getMessage() {
             return message;
         }

Modified: 
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultLogTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultLogTest.java?rev=1853224&r1=1853223&r2=1853224&view=diff
==============================================================================
--- 
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultLogTest.java
 (original)
+++ 
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultLogTest.java
 Fri Feb  8 14:44:58 2019
@@ -83,7 +83,7 @@ public class ResultLogTest {
         log.add(new ResultLog.Entry(Result.Status.CRITICAL, "critical 4"));
 
         final Iterator<ResultLog.Entry> it = log.iterator();
-        assertEquals("OK ok 1", it.next().toString());
+        assertEquals("INFO ok 1", it.next().toString());
         assertEquals("WARN warn 3", it.next().toString());
         assertEquals("CRITICAL critical 4", it.next().toString());
         assertFalse(it.hasNext());

Modified: 
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultTest.java?rev=1853224&r1=1853223&r2=1853224&view=diff
==============================================================================
--- 
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultTest.java
 (original)
+++ 
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/ResultTest.java
 Fri Feb  8 14:44:58 2019
@@ -34,7 +34,7 @@ public class ResultTest {
         assertEquals(expected, r.getStatus());
         assertEquals(expectOk, r.isOk());
         assertTrue(r.iterator().hasNext());
-        assertEquals(toSet.toString() + " " + msg, 
r.iterator().next().toString());
+        assertEquals(new ResultLog.Entry(expected, msg).toString(), 
r.iterator().next().toString());
     }
 
     @Test
@@ -58,6 +58,6 @@ public class ResultTest {
         for (ResultLog.Entry e : result) {
             sb.append(e.toString()).append("#");
         }
-        assertEquals("OK some msg#WARN problematic condition#", sb.toString());
+        assertEquals("INFO some msg#WARN problematic condition#", 
sb.toString());
     }
 }

Modified: 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/jmx/impl/HealthCheckMBean.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/jmx/impl/HealthCheckMBean.java?rev=1853224&r1=1853223&r2=1853224&view=diff
==============================================================================
--- 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/jmx/impl/HealthCheckMBean.java
 (original)
+++ 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/jmx/impl/HealthCheckMBean.java
 Fri Feb  8 14:44:58 2019
@@ -121,7 +121,7 @@ public class HealthCheckMBean implements
         for (final ResultLog.Entry e : er) {
             final Map<String, Object> data = new HashMap<String, Object>();
             data.put(INDEX_COLUMN, i++);
-            data.put(LEVEL_COLUMN, e.getStatus().toString());
+            data.put(LEVEL_COLUMN, e.getLogLevel());
             data.put(MESSAGE_COLUMN, e.getMessage());
 
             result.put(new CompositeDataSupport(LOG_ROW_TYPE, data));