Updated Branches: refs/heads/master d6661e14e -> 2964825ef
CAMEL-6384: Added BacklogDebugger MBean for live debugging of Camel routes. Work in progress. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2964825e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2964825e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2964825e Branch: refs/heads/master Commit: 2964825efb5edc2af194dce19fb99c6cb4987901 Parents: d6661e1 Author: Claus Ibsen <[email protected]> Authored: Thu May 23 08:15:55 2013 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu May 23 08:15:55 2013 +0200 ---------------------------------------------------------------------- .../mbean/ManagedBacklogDebuggerMBean.java | 4 ++-- .../management/mbean/ManagedBacklogDebugger.java | 4 ++-- .../processor/interceptor/BacklogDebugger.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2964825e/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java index 1b2f4da..700b048 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java @@ -41,8 +41,8 @@ public interface ManagedBacklogDebuggerMBean { @ManagedOperation(description = "Add a breakpoint at the given node id") void addBreakpoint(String nodeId); - @ManagedOperation(description = "Add a conditional breakpoint at the given node id (condition is Simple language)") - void addConditionalBreakpoint(String nodeId, String simplePredicate); + @ManagedOperation(description = "Add a conditional breakpoint at the given node id") + void addConditionalBreakpoint(String nodeId, String language, String predicate); @ManagedOperation(description = "Remote the breakpoint from the given node id") void removeBreakpoint(String nodeId); http://git-wip-us.apache.org/repos/asf/camel/blob/2964825e/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java index 9838448..442f6bf 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java @@ -72,8 +72,8 @@ public class ManagedBacklogDebugger implements ManagedBacklogDebuggerMBean { backlogDebugger.addBreakpoint(nodeId); } - public void addConditionalBreakpoint(String nodeId, String simplePredicate) { - backlogDebugger.addConditionalBreakpoint(nodeId, simplePredicate); + public void addConditionalBreakpoint(String nodeId, String language, String predicate) { + backlogDebugger.addConditionalBreakpoint(nodeId, language, predicate); } public void removeBreakpoint(String nodeId) { http://git-wip-us.apache.org/repos/asf/camel/blob/2964825e/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java index b62f334..ecf9bb4 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java +++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java @@ -162,16 +162,16 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy } } - public void addConditionalBreakpoint(String nodeId, String simplePredicate) { - Predicate condition = camelContext.resolveLanguage("simple").createPredicate(simplePredicate); + public void addConditionalBreakpoint(String nodeId, String language, String predicate) { + Predicate condition = camelContext.resolveLanguage(language).createPredicate(predicate); NodeBreakpoint breakpoint = breakpoints.get(nodeId); if (breakpoint == null) { - logger.log("Adding conditional breakpoint " + nodeId + " [" + simplePredicate + "]"); + logger.log("Adding conditional breakpoint " + nodeId + " [" + predicate + "]"); breakpoint = new NodeBreakpoint(nodeId, condition); breakpoints.put(nodeId, breakpoint); debugger.addBreakpoint(breakpoint); } else { - logger.log("Updating conditional breakpoint " + nodeId + " [" + simplePredicate + "]"); + logger.log("Updating conditional breakpoint " + nodeId + " [" + predicate + "]"); // update condition breakpoint.setCondition(condition); }
