You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:39:52 UTC
[sling-org-apache-sling-hc-support] 05/31: SLING-2987 - fix logging
errors
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.support-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-support.git
commit 82038d7b5cd701ccf799dd86bb902d8d39e01ce8
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Aug 13 12:44:23 2013 +0000
SLING-2987 - fix logging errors
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/healthchecks@1513462 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java | 7 +++++--
.../org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java | 2 +-
.../org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java | 2 +-
.../sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java b/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
index a536fbd..6e72e5d 100644
--- a/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
+++ b/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxAttributeHealthCheck.java
@@ -91,7 +91,7 @@ public class JmxAttributeHealthCheck implements HealthCheck {
public Result execute() {
final Result result = new Result(log);
result.log(ResultLogEntry.LT_DEBUG,
- MessageFormatter.format("Checking {} / {} with constraint {}",
+ MessageFormatter.arrayFormat("Checking {} / {} with constraint {}",
new Object[] { mbeanName, attributeName, constraint }).getMessage());
try {
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
@@ -100,7 +100,10 @@ public class JmxAttributeHealthCheck implements HealthCheck {
log.error("MBean not found: {}", objectName);
}
final Object value = jmxServer.getAttribute(objectName, attributeName);
- log.debug("{} {} returns {}", new Object[] { mbeanName, attributeName, value });
+ result.log(ResultLogEntry.LT_DEBUG,
+ MessageFormatter.arrayFormat(
+ "{} {} returns {}",
+ new Object[] { mbeanName, attributeName, value }).getMessage());
new SimpleConstraintChecker().check(value, constraint, result);
} catch(Exception e) {
log.warn(e.toString(), e);
diff --git a/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java b/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java
index bbfc95e..6773c56 100644
--- a/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java
+++ b/src/main/java/org/apache/sling/hc/healthchecks/impl/JmxScriptBinding.java
@@ -54,7 +54,7 @@ public class JmxScriptBinding {
result.log(ResultLogEntry.LT_DEBUG, MessageFormatter.format("Got JMX Object [{}]", name).getMessage());
final Object value = jmxServer.getAttribute(name, attributeName);
result.log(ResultLogEntry.LT_DEBUG,
- MessageFormatter.format(
+ MessageFormatter.arrayFormat(
"JMX Object [{}] Attribute [{}] = [{}]",
new Object[] { name, attributeName, value }).getMessage());
return value;
diff --git a/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java b/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java
index 27e9f28..29f80db 100644
--- a/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java
+++ b/src/main/java/org/apache/sling/hc/healthchecks/impl/OsgiScriptBinding.java
@@ -53,7 +53,7 @@ public class OsgiScriptBinding {
if(!isFragment(b) && Bundle.ACTIVE != b.getState()) {
active = false;
result.log(ResultLogEntry.LT_INFO,
- MessageFormatter.format(
+ MessageFormatter.arrayFormat(
"Bundle {} is not active, state={} ({})",
new Object[] { b.getSymbolicName(), b.getState(), b.getState()}).getMessage());
}
diff --git a/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java b/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java
index 744561d..32fd6d4 100644
--- a/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java
+++ b/src/main/java/org/apache/sling/hc/healthchecks/impl/SlingRequestStatusHealthCheck.java
@@ -118,7 +118,7 @@ public class SlingRequestStatusHealthCheck implements HealthCheck {
if(status != ps.status) {
failed++;
result.log(ResultLogEntry.LT_WARN,
- MessageFormatter.format(
+ MessageFormatter.arrayFormat(
"[{}] returns status {}, expected {}", new Object[] { ps.path, status, ps.status }).getMessage());
} else {
result.log(ResultLogEntry.LT_DEBUG,
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.