Author: cziegeler
Date: Sun Oct 30 13:08:13 2016
New Revision: 1767157
URL: http://svn.apache.org/viewvc?rev=1767157&view=rev
Log:
Correct metatype info
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.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=1767157&r1=1767156&r2=1767157&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
Sun Oct 30 13:08:13 2016
@@ -38,15 +38,12 @@ import org.apache.sling.hc.api.ResultLog
import org.apache.sling.hc.api.execution.HealthCheckExecutionResult;
import org.apache.sling.hc.util.FormattingResultLog;
import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/** Serializes health check results into html format. */
@Service(ResultHtmlSerializer.class)
-@Component(metatype = true)
+@Component(metatype = true, name="Apache Sling Health Check Result Serializer",
+ description="Serializer for health check results")
public class ResultHtmlSerializer {
- private static final Logger LOG =
LoggerFactory.getLogger(ResultHtmlSerializer.class);
-
private static final String CSS_STYLE_DEFAULT = "body { font-size:12px;
font-family:arial,verdana,sans-serif;background-color:#FFFDF1; }\n"
+ "h1 { font-size:20px;}\n"
+ "table { font-size:12px; border:#ccc 1px solid;
border-radius:3px; }\n"
@@ -82,7 +79,7 @@ public class ResultHtmlSerializer {
final DateFormat dfShort = new SimpleDateFormat("HH:mm:ss.SSS");
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 colspan=\"2\">Execution
Time</th></tr></thead>");
for (HealthCheckExecutionResult executionResult : executionResults) {
@@ -101,15 +98,15 @@ public class ResultHtmlSerializer {
if(!includeDebug && entry.getStatus()==Result.Status.DEBUG) {
continue;
}
-
+
if (isFirst) {
isFirst = false;
} else {
writer.println("<br/>\n");
}
-
+
boolean showStatus = !isSingleResult &&
entry.getStatus()!=Result.Status.DEBUG && entry.getStatus()
!=Result.Status.INFO;
-
+
String message =
StringEscapeUtils.escapeHtml(entry.getMessage());
if(entry.getStatus()==Result.Status.DEBUG) {
message = "<span style='color:gray'/>"+message +
"</span>";
@@ -128,11 +125,11 @@ public class ResultHtmlSerializer {
Date finishedAt = executionResult.getFinishedAt();
writer.println("<td>" + (isToday(finishedAt) ?
dfShort.format(finishedAt) : dfLong.format(finishedAt)) + "</td>");
writer.println("<td>" +
FormattingResultLog.msHumanReadable(executionResult.getElapsedTimeInMs()) +
"</td>");
-
+
writer.println("</tr>");
}
writer.println("</table>");
-
+
writer.println("<div class='helpText'>");
writer.println(escapedHelpText);
writer.println("</div>");