You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2017/05/02 17:01:16 UTC
svn commit: r1793562 - in /sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet: ResultHtmlSerializer.java ResultJsonSerializer.java

Author: justin
Date: Tue May  2 17:01:16 2017
New Revision: 1793562

URL: http://svn.apache.org/viewvc?rev=1793562&view=rev
Log:
SLING-6806 - add tags to HTML/JSON Health Check output

Modified:
    sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
    sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java

Modified: sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java?rev=1793562&r1=1793561&r2=1793562&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java Tue May  2 17:01:16 2017
@@ -81,13 +81,14 @@ public class ResultHtmlSerializer {
         final DateFormat dfLong = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         writer.println("<table id=\"healthCheckResults\" cellspacing=\"0\">");
-        writer.println("<thead><tr><th>Health Check</th><th>Status</th><th>Log</th><th>Finished At</th><th>Execution Time</th></tr></thead>");
+        writer.println("<thead><tr><th>Health Check</th><th>Tags</th><th>Status</th><th>Log</th><th>Finished At</th><th>Execution Time</th></tr></thead>");
         for (HealthCheckExecutionResult executionResult : executionResults) {
             Result result = executionResult.getHealthCheckResult();
             writer.println("<tr class=\"" + getClassForStatus(result.getStatus()) + "\" "
                     + "title=\"Tags: " + StringEscapeUtils.escapeHtml(StringUtils.join(executionResult.getHealthCheckMetadata().getTags(), ",")) + "\">");
             writer.println("<td><span title=\"" + StringEscapeUtils.escapeHtml(executionResult.getHealthCheckMetadata().getName()) + "\">"
                     + StringEscapeUtils.escapeHtml(executionResult.getHealthCheckMetadata().getTitle()) + "</span></td>");
+            writer.println("<td style='font-weight:bold;'>" + StringEscapeUtils.escapeHtml(StringUtils.join(executionResult.getHealthCheckMetadata().getTags(), ", ")) + "</td>");
             writer.println("<td style='font-weight:bold;'>" + StringEscapeUtils.escapeHtml(result.getStatus().toString()) + "</td>");
             writer.println("<td>");
             boolean isFirst = true;

Modified: sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java?rev=1793562&r1=1793561&r2=1793562&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java Tue May  2 17:01:16 2017
@@ -86,6 +86,11 @@ public class ResultJsonSerializer {
         result.add("status", healthCheckResult.getHealthCheckResult().getStatus().toString());
         result.add("timeInMs", healthCheckResult.getElapsedTimeInMs());
         result.add("finishedAt", healthCheckResult.getFinishedAt().toString());
+        JsonArrayBuilder tagsArray = Json.createArrayBuilder();
+        for (final String tag : healthCheckResult.getHealthCheckMetadata().getTags()) {
+            tagsArray.add(tag);
+        }
+        result.add("tags", tagsArray);
 
         JsonArrayBuilder messagesArr = Json.createArrayBuilder();