CAMEL-10885 Expose via JMX property and command
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/332d074d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/332d074d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/332d074d Branch: refs/heads/master Commit: 332d074d130013d5a4dfac1c12e4efa0df677e37 Parents: 4dc6438 Author: Tomohisa Igarashi <tm.igara...@gmail.com> Authored: Fri Mar 24 14:02:44 2017 +0900 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 28 09:46:16 2017 +0200 ---------------------------------------------------------------------- .../camel/api/management/mbean/ManagedCamelContextMBean.java | 3 +++ .../org/apache/camel/management/mbean/ManagedCamelContext.java | 4 ++++ .../java/org/apache/camel/management/mbean/ManagedRoute.java | 4 ++++ .../org/apache/camel/management/ManagedCamelContextTest.java | 3 +++ .../org/apache/camel/commands/AbstractLocalCamelController.java | 1 + .../main/java/org/apache/camel/commands/ContextInfoCommand.java | 1 + 6 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/332d074d/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java index b3910db..0cce076 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java @@ -148,6 +148,9 @@ public interface ManagedCamelContextMBean extends ManagedPerformanceCounterMBean @ManagedAttribute(description = "Whether message history is enabled") boolean isMessageHistory(); + @ManagedAttribute(description = "Whether security mask for Log EIP is enabled") + boolean isLogEipMask(); + @ManagedAttribute(description = "Whether MDC logging is supported") boolean isUseMDCLogging(); http://git-wip-us.apache.org/repos/asf/camel/blob/332d074d/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java index 0ea16a0..c73eb84 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java @@ -268,6 +268,10 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti return context.isMessageHistory() != null ? context.isMessageHistory() : false; } + public boolean isLogEipMask() { + return context.isLogEipMask() != null ? context.isLogEipMask() : false; + } + public boolean isUseMDCLogging() { return context.isUseMDCLogging(); } http://git-wip-us.apache.org/repos/asf/camel/blob/332d074d/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java index ce18da6..72fa98a 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java @@ -159,6 +159,10 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList return route.getRouteContext().isMessageHistory(); } + public Boolean getLogEipMask() { + return route.getRouteContext().isLogEipMask(); + } + public String getRoutePolicyList() { List<RoutePolicy> policyList = route.getRouteContext().getRoutePolicyList(); http://git-wip-us.apache.org/repos/asf/camel/blob/332d074d/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java index db14b56..b3d6222 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java @@ -91,6 +91,9 @@ public class ManagedCamelContextTest extends ManagementTestSupport { Boolean messageHistory = (Boolean) mbeanServer.getAttribute(on, "MessageHistory"); assertEquals(Boolean.TRUE, messageHistory); + Boolean logEipMask = (Boolean) mbeanServer.getAttribute(on, "LogEipMask"); + assertEquals(Boolean.FALSE, logEipMask); + Integer total = (Integer) mbeanServer.getAttribute(on, "TotalRoutes"); assertEquals(2, total.intValue()); http://git-wip-us.apache.org/repos/asf/camel/blob/332d074d/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java index f37d85b..51c13ce 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java @@ -83,6 +83,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll answer.put("allowUseOriginalMessage", context.isAllowUseOriginalMessage()); answer.put("messageHistory", context.isMessageHistory()); answer.put("tracing", context.isTracing()); + answer.put("logEipMask", context.isLogEipMask()); answer.put("shutdownTimeout", context.getShutdownStrategy().getTimeUnit().toSeconds(context.getShutdownStrategy().getTimeout())); answer.put("classResolver", context.getClassResolver().toString()); answer.put("packageScanClassResolver", context.getPackageScanClassResolver().toString()); http://git-wip-us.apache.org/repos/asf/camel/blob/332d074d/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java index 9ca57b1..2e58d50 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java @@ -80,6 +80,7 @@ public class ContextInfoCommand extends AbstractContextCommand { out.println(stringEscape.unescapeJava("\tAllow UseOriginalMessage: " + row.get("allowUseOriginalMessage"))); out.println(stringEscape.unescapeJava("\tMessage History: " + row.get("messageHistory"))); out.println(stringEscape.unescapeJava("\tTracing: " + row.get("tracing"))); + out.println(stringEscape.unescapeJava("\tLog EIP Mask: " + row.get("logEipMask"))); out.println(""); out.println(stringEscape.unescapeJava("\u001B[1mProperties\u001B[0m")); for (Map.Entry<String, Object> entry : row.entrySet()) {
