Author: ghenzler
Date: Tue Jan 8 16:13:42 2019
New Revision: 1850768
URL: http://svn.apache.org/viewvc?rev=1850768&view=rev
Log:
FELIX-6016 Moved FormattingResultLog to package org.apache.felix.hc.api
Added:
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/FormattingResultLog.java
- copied, changed from r1850747,
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/util/FormattingResultLog.java
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/FormattingResultLogTest.java
(with props)
Removed:
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/util/
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/util/
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/UnitsUtil.java
felix/trunk/healthcheck/generalchecks/src/test/java/org/apache/felix/hc/generalchecks/util/UnitsUtilTest.java
Modified:
felix/trunk/healthcheck/api/bnd.bnd
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/HealthCheck.java
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/Result.java
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeHealthCheck.java
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeResult.java
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/JmxAdjustableStatusHealthCheck.java
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckExecutorImpl.java
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckFuture.java
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java
felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializerTest.java
felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/it/JmxAdjustableStatusHealthCheckIT.java
felix/trunk/healthcheck/generalchecks/pom.xml
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/CpuCheck.java
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/DiskSpaceCheck.java
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/JmxAttributeCheck.java
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/MemoryCheck.java
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/ThreadUsageCheck.java
felix/trunk/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
felix/trunk/healthcheck/webconsoleplugin/src/test/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePluginTest.java
Modified: felix/trunk/healthcheck/api/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/api/bnd.bnd?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
--- felix/trunk/healthcheck/api/bnd.bnd (original)
+++ felix/trunk/healthcheck/api/bnd.bnd Tue Jan 8 16:13:42 2019
@@ -8,5 +8,5 @@ Bundle-License: Apache License, Version
Bundle-Vendor: The Apache Software Foundation
-Export-Package: org.apache.felix.hc.*
+Export-Package: org.apache.felix.hc.api.*
Copied:
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/FormattingResultLog.java
(from r1850747,
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/util/FormattingResultLog.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/FormattingResultLog.java?p2=felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/FormattingResultLog.java&p1=felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/util/FormattingResultLog.java&r1=1850747&r2=1850768&rev=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/util/FormattingResultLog.java
(original)
+++
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/FormattingResultLog.java
Tue Jan 8 16:13:42 2019
@@ -15,17 +15,15 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.felix.hc.util;
+package org.apache.felix.hc.api;
import java.text.NumberFormat;
import java.util.Locale;
-import org.apache.felix.hc.api.Result;
-import org.apache.felix.hc.api.ResultLog;
import org.osgi.annotation.versioning.ProviderType;
import org.slf4j.helpers.MessageFormatter;
-/** Utility that provides a logging-like facade on a ResultLog */
+/** Utility that provides a logging-like facade on a ResultLog. */
@ProviderType
public class FormattingResultLog extends ResultLog {
@@ -86,4 +84,32 @@ public class FormattingResultLog extends
String result = format.format(number) + units[magnitude];
return result;
}
+
+
+ /**
+ * Utility method to return any magnitude of bytes in a human readable
format using the appropriate unit (kB, MB, GB)
+ * depending on the magnitude of the input.
+ *
+ * @param size in bytes
+ * @return a human readable result
+ */
+ public static String bytesHumanReadable(double size) {
+
+ double step = 1024, current = step;
+ final String SIZES[] = { "kB", "MB", "GB", "TB" };
+ int i;
+ for (i = 0; i < SIZES.length - 1; ++i) {
+ if (size < current * step) {
+ break;
+ }
+ current *= step;
+ }
+
+ String unit = SIZES[i];
+ double value = size / current;
+ String retVal = String.format("%.1f", value) + unit;
+ return retVal;
+ }
+
+
}
\ No newline at end of file
Modified:
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/HealthCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/HealthCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/HealthCheck.java
(original)
+++
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/HealthCheck.java
Tue Jan 8 16:13:42 2019
@@ -19,7 +19,9 @@ package org.apache.felix.hc.api;
import org.osgi.annotation.versioning.ConsumerType;
-/** Health Check services can be executed and return an execution {@link
Result}.
+/** The Health Check SPI provides a means to check a certain system aspect
programmatically. Health checks return a result {@link Result},
+ * for most cases it is most convenient to use {@link FormattingResultLog}
that automatically derives the correct {@link Result.Status} from
+ * the log messages.
*
* Clients should not look up health checks directly but rather use the {@link
org.apache.felix.hc.api.execution.HealthCheckExecutor}
* service and executed checks based on tags.
@@ -58,7 +60,6 @@ public interface HealthCheck {
* disappear but might leave the system at an inconsistent state (e.g. an
event queue overflow). */
String WARNINGS_STICK_FOR_MINUTES = "hc.warningsStickForMinutes";
- /** Execute this health check and return a {@link Result} This is meant to
execute quickly, access to external systems, for example,
- * should be managed asynchronously. */
+ /** Execute this health check and return a {@link Result}.*/
Result execute();
}
Modified:
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/Result.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/Result.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/Result.java
(original)
+++
felix/trunk/healthcheck/api/src/main/java/org/apache/felix/hc/api/Result.java
Tue Jan 8 16:13:42 2019
@@ -22,8 +22,6 @@ import java.util.Iterator;
/** The result of executing a {@link HealthCheck} */
public class Result implements Iterable<ResultLog.Entry> {
- protected final ResultLog resultLog;
-
public enum Status {
OK, // system is fully operational
WARN, // attention required but system is operational
@@ -32,6 +30,8 @@ public class Result implements Iterable<
HEALTH_CHECK_ERROR // health check itself did not execute properly (no
reliable status is known)
}
+ protected final ResultLog resultLog;
+
/** Build a single-value Result
*
* @param s if lower than OK, our status is set to OK */
Added:
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/FormattingResultLogTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/FormattingResultLogTest.java?rev=1850768&view=auto
==============================================================================
---
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/FormattingResultLogTest.java
(added)
+++
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/FormattingResultLogTest.java
Tue Jan 8 16:13:42 2019
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The SF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.felix.hc.api;
+
+import static org.apache.felix.hc.api.FormattingResultLog.bytesHumanReadable;
+import static org.apache.felix.hc.api.FormattingResultLog.msHumanReadable;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class FormattingResultLogTest {
+
+ @Test
+ public void testBytesHumanReadable() {
+ assertEquals("5.0MB", bytesHumanReadable(5d*1024*1024));
+ assertEquals("2.0GB", bytesHumanReadable(2d*1024*1024*1024));
+ assertEquals("706.1kB", bytesHumanReadable(722998));
+ }
+
+ @Test
+ public void testMSHumanReadable() {
+ assertEquals("320ms", msHumanReadable(320));
+ assertEquals("5sec", msHumanReadable(5*1000));
+ assertEquals("1min", msHumanReadable(60*1000));
+ assertEquals("1.2min", msHumanReadable(72*1000));
+ assertEquals("3h", msHumanReadable(3*60*60*1000));
+ }
+
+}
Propchange:
felix/trunk/healthcheck/api/src/test/java/org/apache/felix/hc/api/FormattingResultLogTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeHealthCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeHealthCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeHealthCheck.java
(original)
+++
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeHealthCheck.java
Tue Jan 8 16:13:42 2019
@@ -22,6 +22,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.Result.Status;
@@ -31,7 +32,6 @@ import org.apache.felix.hc.api.execution
import org.apache.felix.hc.api.execution.HealthCheckMetadata;
import org.apache.felix.hc.api.execution.HealthCheckSelector;
import org.apache.felix.hc.core.impl.util.HealthCheckFilter;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Modified:
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeResult.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeResult.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeResult.java
(original)
+++
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/CompositeResult.java
Tue Jan 8 16:13:42 2019
@@ -17,7 +17,7 @@
*/
package org.apache.felix.hc.core.impl;
-import static org.apache.felix.hc.util.FormattingResultLog.msHumanReadable;
+import static org.apache.felix.hc.api.FormattingResultLog.msHumanReadable;
import java.util.List;
Modified:
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/JmxAdjustableStatusHealthCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/JmxAdjustableStatusHealthCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/JmxAdjustableStatusHealthCheck.java
(original)
+++
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/JmxAdjustableStatusHealthCheck.java
Tue Jan 8 16:13:42 2019
@@ -36,11 +36,11 @@ import javax.management.MBeanParameterIn
import javax.management.ReflectionException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.Result.Status;
import org.apache.felix.hc.api.ResultLog.Entry;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.ComponentContext;
Modified:
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckExecutorImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckExecutorImpl.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckExecutorImpl.java
(original)
+++
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckExecutorImpl.java
Tue Jan 8 16:13:42 2019
@@ -17,10 +17,10 @@
*/
package org.apache.felix.hc.core.impl.executor;
+import static org.apache.felix.hc.api.FormattingResultLog.msHumanReadable;
import static
org.apache.felix.hc.core.impl.executor.HealthCheckExecutorImplConfiguration.LONGRUNNING_FUTURE_THRESHOLD_CRITICAL_DEFAULT_MS;
import static
org.apache.felix.hc.core.impl.executor.HealthCheckExecutorImplConfiguration.RESULT_CACHE_TTL_DEFAULT_MS;
import static
org.apache.felix.hc.core.impl.executor.HealthCheckExecutorImplConfiguration.TIMEOUT_DEFAULT_MS;
-import static org.apache.felix.hc.util.FormattingResultLog.msHumanReadable;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -40,6 +40,7 @@ import java.util.Set;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.time.StopWatch;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog;
@@ -50,7 +51,6 @@ import org.apache.felix.hc.api.execution
import org.apache.felix.hc.api.execution.HealthCheckSelector;
import org.apache.felix.hc.core.impl.executor.async.AsyncHealthCheckExecutor;
import org.apache.felix.hc.core.impl.util.HealthCheckFilter;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
@@ -445,7 +445,7 @@ public class HealthCheckExecutorImpl imp
DateFormat df = new SimpleDateFormat("HH:mm:ss.SSS");
resultLog.info("*** Result log of last execution finished at
{} after {} ***",
df.format(lastCachedResult.getFinishedAt()),
-
FormattingResultLog.msHumanReadable(lastCachedResult.getElapsedTimeInMs()));
+
msHumanReadable(lastCachedResult.getElapsedTimeInMs()));
for (ResultLog.Entry entry :
lastCachedResult.getHealthCheckResult()) {
resultLog.add(entry);
}
Modified:
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckFuture.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckFuture.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckFuture.java
(original)
+++
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/executor/HealthCheckFuture.java
Tue Jan 8 16:13:42 2019
@@ -17,7 +17,7 @@
*/
package org.apache.felix.hc.core.impl.executor;
-import static org.apache.felix.hc.util.FormattingResultLog.msHumanReadable;
+import static org.apache.felix.hc.api.FormattingResultLog.msHumanReadable;
import java.lang.reflect.InvocationTargetException;
import java.util.Date;
@@ -28,12 +28,12 @@ import java.util.concurrent.FutureTask;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.commons.lang3.reflect.MethodUtils;
import org.apache.commons.lang3.time.StopWatch;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog;
import org.apache.felix.hc.api.execution.HealthCheckExecutionResult;
import org.apache.felix.hc.api.execution.HealthCheckMetadata;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java
(original)
+++
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java
Tue Jan 8 16:13:42 2019
@@ -17,6 +17,8 @@
*/
package org.apache.felix.hc.core.impl.servlet;
+import static org.apache.felix.hc.api.FormattingResultLog.msHumanReadable;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.DateFormat;
@@ -30,7 +32,6 @@ import org.apache.commons.lang3.StringUt
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog.Entry;
import org.apache.felix.hc.api.execution.HealthCheckExecutionResult;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -111,7 +112,7 @@ public class ResultHtmlSerializer {
writer.println("</td>");
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("<td>" +
msHumanReadable(executionResult.getElapsedTimeInMs()) + "</td>");
writer.println("</tr>");
}
Modified:
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java
(original)
+++
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java
Tue Jan 8 16:13:42 2019
@@ -17,6 +17,8 @@
*/
package org.apache.felix.hc.core.impl.servlet;
+import static org.apache.felix.hc.api.FormattingResultLog.msHumanReadable;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.List;
@@ -26,7 +28,6 @@ import org.apache.commons.lang3.text.Wor
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog;
import org.apache.felix.hc.api.execution.HealthCheckExecutionResult;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger;
@@ -100,7 +101,7 @@ public class ResultTxtVerboseSerializer
resultStr.append(wrappedName + StringUtils.repeat(" ", paddingSize));
resultStr.append(StringUtils.rightPad(healthCheckResult.getHealthCheckResult().getStatus().toString(),
colWidthResult));
resultStr.append(StringUtils.rightPad("[" +
dfShort.format(healthCheckResult.getFinishedAt())
- + "|" +
FormattingResultLog.msHumanReadable(healthCheckResult.getElapsedTimeInMs()) +
"]", colWidthTiming));
+ + "|" +
msHumanReadable(healthCheckResult.getElapsedTimeInMs()) + "]", colWidthTiming));
boolean isFirst = true;
for (ResultLog.Entry logEntry :
healthCheckResult.getHealthCheckResult()) {
Modified:
felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializerTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializerTest.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializerTest.java
(original)
+++
felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializerTest.java
Tue Jan 8 16:13:42 2019
@@ -25,12 +25,12 @@ import static org.mockito.MockitoAnnotat
import java.util.Arrays;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.execution.HealthCheckExecutionResult;
import org.apache.felix.hc.api.execution.HealthCheckMetadata;
import org.apache.felix.hc.core.impl.executor.ExecutionResult;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
Modified:
felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/it/JmxAdjustableStatusHealthCheckIT.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/it/JmxAdjustableStatusHealthCheckIT.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/it/JmxAdjustableStatusHealthCheckIT.java
(original)
+++
felix/trunk/healthcheck/core/src/test/java/org/apache/felix/hc/core/it/JmxAdjustableStatusHealthCheckIT.java
Tue Jan 8 16:13:42 2019
@@ -27,6 +27,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.management.DynamicMBean;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog;
@@ -35,7 +36,6 @@ import org.apache.felix.hc.api.execution
import org.apache.felix.hc.api.execution.HealthCheckExecutor;
import org.apache.felix.hc.api.execution.HealthCheckSelector;
import org.apache.felix.hc.core.impl.JmxAdjustableStatusHealthCheck;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: felix/trunk/healthcheck/generalchecks/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/pom.xml?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
--- felix/trunk/healthcheck/generalchecks/pom.xml (original)
+++ felix/trunk/healthcheck/generalchecks/pom.xml Tue Jan 8 16:13:42 2019
@@ -31,7 +31,7 @@
<artifactId>org.apache.felix.healthcheck.generalchecks</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <name>Apache Felix Health Check :: General Checks</name>
+ <name>Apache Felix Health Check General Checks</name>
<inceptionYear>2013</inceptionYear>
<description>
Modified:
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java
(original)
+++
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java
Tue Jan 8 16:13:42 2019
@@ -21,9 +21,9 @@ import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import org.apache.felix.hc.annotation.HealthCheckService;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Modified:
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/CpuCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/CpuCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/CpuCheck.java
(original)
+++
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/CpuCheck.java
Tue Jan 8 16:13:42 2019
@@ -28,10 +28,10 @@ import javax.management.ObjectName;
import javax.management.ReflectionException;
import org.apache.felix.hc.annotation.HealthCheckService;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
Modified:
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/DiskSpaceCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/DiskSpaceCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/DiskSpaceCheck.java
(original)
+++
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/DiskSpaceCheck.java
Tue Jan 8 16:13:42 2019
@@ -17,16 +17,16 @@
*/
package org.apache.felix.hc.generalchecks;
-import static org.apache.felix.hc.generalchecks.util.UnitsUtil.formatBytes;
+import static org.apache.felix.hc.api.FormattingResultLog.bytesHumanReadable;
import java.io.File;
import java.util.Arrays;
import org.apache.felix.hc.annotation.HealthCheckService;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
@@ -102,8 +102,8 @@ public class DiskSpaceCheck implements H
double free = diskPathFile.getUsableSpace();
double usedPercentage = (total - free) / total * 100d;
- String totalStr = formatBytes(total);
- String freeStr = formatBytes(free);
+ String totalStr = bytesHumanReadable(total);
+ String freeStr = bytesHumanReadable(free);
String msg = String.format("Disk Usage %s: %.1f%% of %s used / %s
free", diskPathFile.getAbsolutePath(),
usedPercentage,
totalStr, freeStr);
Modified:
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/JmxAttributeCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/JmxAttributeCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/JmxAttributeCheck.java
(original)
+++
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/JmxAttributeCheck.java
Tue Jan 8 16:13:42 2019
@@ -22,11 +22,11 @@ import java.lang.management.ManagementFa
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog;
import org.apache.felix.hc.generalchecks.util.SimpleConstraintChecker;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
Modified:
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/MemoryCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/MemoryCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/MemoryCheck.java
(original)
+++
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/MemoryCheck.java
Tue Jan 8 16:13:42 2019
@@ -17,13 +17,13 @@
*/
package org.apache.felix.hc.generalchecks;
-import static org.apache.felix.hc.generalchecks.util.UnitsUtil.formatBytes;
+import static org.apache.felix.hc.api.FormattingResultLog.bytesHumanReadable;
import org.apache.felix.hc.annotation.HealthCheckService;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog.Entry;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
@@ -75,11 +75,11 @@ public class MemoryCheck implements Heal
Runtime runtime = Runtime.getRuntime();
long freeMemory = runtime.freeMemory();
- log.debug("Free memory: {}", formatBytes(freeMemory));
+ log.debug("Free memory: {}", bytesHumanReadable(freeMemory));
long currentlyAllocatedByJVM = runtime.totalMemory();
- log.debug("Currently allocated memory: {}",
formatBytes(currentlyAllocatedByJVM));
+ log.debug("Currently allocated memory: {}",
bytesHumanReadable(currentlyAllocatedByJVM));
long usedMemory = currentlyAllocatedByJVM - freeMemory;
- log.debug("Used memory: {}", formatBytes(usedMemory));
+ log.debug("Used memory: {}", bytesHumanReadable(usedMemory));
long maxMemoryAvailableToJVM = runtime.maxMemory();
double memoryUsedPercentage = ((double) usedMemory /
maxMemoryAvailableToJVM * 100d);
@@ -89,7 +89,7 @@ public class MemoryCheck implements Heal
memoryUsedPercentage <
this.heapUsedPercentageThresholdCritical ? Result.Status.WARN
: Result.Status.CRITICAL;
- String message = String.format("Memory Usage: %.1f%% of %s maximal
heap used", memoryUsedPercentage, formatBytes(maxMemoryAvailableToJVM));
+ String message = String.format("Memory Usage: %.1f%% of %s maximal
heap used", memoryUsedPercentage, bytesHumanReadable(maxMemoryAvailableToJVM));
log.add(new Entry(status, message));
Modified:
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/ThreadUsageCheck.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/ThreadUsageCheck.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/ThreadUsageCheck.java
(original)
+++
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/ThreadUsageCheck.java
Tue Jan 8 16:13:42 2019
@@ -27,10 +27,10 @@ import java.util.List;
import java.util.Map;
import org.apache.felix.hc.annotation.HealthCheckService;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.ResultLog;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
Modified:
felix/trunk/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
(original)
+++
felix/trunk/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
Tue Jan 8 16:13:42 2019
@@ -18,7 +18,7 @@
package org.apache.felix.hc.webconsole.impl;
import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4;
-import static org.apache.felix.hc.util.FormattingResultLog.msHumanReadable;
+import static org.apache.felix.hc.api.FormattingResultLog.msHumanReadable;
import java.io.IOException;
import java.io.InputStream;
Modified:
felix/trunk/healthcheck/webconsoleplugin/src/test/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePluginTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/webconsoleplugin/src/test/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePluginTest.java?rev=1850768&r1=1850767&r2=1850768&view=diff
==============================================================================
---
felix/trunk/healthcheck/webconsoleplugin/src/test/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePluginTest.java
(original)
+++
felix/trunk/healthcheck/webconsoleplugin/src/test/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePluginTest.java
Tue Jan 8 16:13:42 2019
@@ -27,11 +27,11 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import org.apache.felix.hc.api.FormattingResultLog;
import org.apache.felix.hc.api.HealthCheck;
import org.apache.felix.hc.api.Result;
import org.apache.felix.hc.api.execution.HealthCheckMetadata;
import org.apache.felix.hc.core.impl.executor.ExecutionResult;
-import org.apache.felix.hc.util.FormattingResultLog;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
