Updated Branches:
  refs/heads/master 2cce9b0c4 -> 349744091

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/34974409
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/34974409
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/34974409

Branch: refs/heads/master
Commit: 349744091579629b03c73ce58774b0ea23fb3c73
Parents: 2cce9b0
Author: Claus Ibsen <[email protected]>
Authored: Wed May 22 11:34:53 2013 +0200
Committer: Claus Ibsen <[email protected]>
Committed: Wed May 22 13:02:54 2013 +0200

----------------------------------------------------------------------
 .../mbean/ManagedBacklogDebuggerMBean.java         |   11 ++++-
 .../management/mbean/ManagedBacklogDebugger.java   |   17 ++++++-
 .../processor/interceptor/BacklogDebugger.java     |   40 +++++++++++++-
 .../camel/management/BacklogDebuggerTest.java      |    1 +
 4 files changed, 63 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/34974409/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 3709011..fd98029 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
@@ -33,7 +33,7 @@ public interface ManagedBacklogDebuggerMBean {
     void disableDebugger();
 
     @ManagedOperation(description = "Add a breakpoint at the given node id")
-    void addBreakpoint(String nodeId);
+    void addBreakpoint(String nodeId, boolean internal);
 
     @ManagedOperation(description = "Remote the breakpoint from the given node 
id")
     void removeBreakpoint(String nodeId);
@@ -41,9 +41,18 @@ public interface ManagedBacklogDebuggerMBean {
     @ManagedOperation(description = "Continue debugging the suspended 
breakpoints at the given node id")
     void continueBreakpoint(String nodeId);
 
+    @ManagedOperation(description = "Return the node ids which has 
breakpoints")
+    Set<String> getBreakpoints(boolean includeInternal);
+
     @ManagedOperation(description = "Return the node ids which is currently 
suspended")
     Set<String> getSuspendedBreakpointNodeIds();
 
+    @ManagedOperation(description = "Suspend a breakpoint")
+    public void suspendBreakpoint(String nodeId);
+
+    @ManagedOperation(description = "Activate a breakpoint")
+    public void activateBreakpoint(String nodeId);
+
     @ManagedOperation(description = "Dumps the messages in xml format from the 
suspended breakpoint at the given node")
     String dumpTracedMessagesAsXml(String nodeId);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/34974409/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 f6fac11..13387a9 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
@@ -19,6 +19,7 @@ package org.apache.camel.management.mbean;
 import java.util.Set;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.api.management.ManagedOperation;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedBacklogDebuggerMBean;
 import org.apache.camel.processor.interceptor.BacklogDebugger;
@@ -59,14 +60,18 @@ public class ManagedBacklogDebugger implements 
ManagedBacklogDebuggerMBean {
         backlogDebugger.disableDebugger();
     }
 
-    public void addBreakpoint(String nodeId) {
-        backlogDebugger.addBreakpoint(nodeId);
+    public void addBreakpoint(String nodeId, boolean internal) {
+        backlogDebugger.addBreakpoint(nodeId, internal);
     }
 
     public void removeBreakpoint(String nodeId) {
         backlogDebugger.removeBreakpoint(nodeId);
     }
 
+    public Set<String> getBreakpoints(boolean includeInternal) {
+        return backlogDebugger.getBreakpoints(includeInternal);
+    }
+
     public void continueBreakpoint(String nodeId) {
         backlogDebugger.continueBreakpoint(nodeId);
     }
@@ -75,6 +80,14 @@ public class ManagedBacklogDebugger implements 
ManagedBacklogDebuggerMBean {
         return backlogDebugger.getSuspendedBreakpointNodeIds();
     }
 
+    public void suspendBreakpoint(String nodeId) {
+        backlogDebugger.suspendBreakpoint(nodeId);
+    }
+
+    public void activateBreakpoint(String nodeId) {
+        backlogDebugger.activateBreakpoint(nodeId);
+    }
+
     public String dumpTracedMessagesAsXml(String nodeId) {
         return backlogDebugger.dumpTracedMessagesAsXml(nodeId);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/34974409/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 557d992..efac7b1 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
@@ -124,9 +124,9 @@ public class BacklogDebugger extends ServiceSupport 
implements InterceptStrategy
         return breakpoints.containsKey(nodeId);
     }
 
-    public void addBreakpoint(String nodeId) {
+    public void addBreakpoint(String nodeId, boolean internal) {
         if (!breakpoints.containsKey(nodeId)) {
-            NodeBreakpoint breakpoint = new NodeBreakpoint(nodeId);
+            NodeBreakpoint breakpoint = new NodeBreakpoint(nodeId, internal);
             breakpoints.put(nodeId, breakpoint);
             debugger.addBreakpoint(breakpoint);
         }
@@ -145,6 +145,16 @@ public class BacklogDebugger extends ServiceSupport 
implements InterceptStrategy
         }
     }
 
+    public Set<String> getBreakpoints(boolean includeInternal) {
+        Set<String> answer = new LinkedHashSet<String>();
+        for (NodeBreakpoint breakpoint : breakpoints.values()) {
+            if (!breakpoint.isInternal() || includeInternal) {
+                answer.add(breakpoint.getNodeId());
+            }
+        }
+        return answer;
+    }
+
     public void continueBreakpoint(String nodeId) {
         // remember to remove the dumped message as its no longer in need
         suspendedBreakpointMessages.remove(nodeId);
@@ -158,6 +168,20 @@ public class BacklogDebugger extends ServiceSupport 
implements InterceptStrategy
         return new LinkedHashSet<String>(suspendedBreakpoints.keySet());
     }
 
+    public void suspendBreakpoint(String nodeId) {
+        NodeBreakpoint breakpoint = breakpoints.get(nodeId);
+        if (breakpoint != null) {
+            breakpoint.suspend();
+        }
+    }
+
+    public void activateBreakpoint(String nodeId) {
+        NodeBreakpoint breakpoint = breakpoints.get(nodeId);
+        if (breakpoint != null) {
+            breakpoint.activate();
+        }
+    }
+
     public String dumpTracedMessagesAsXml(String nodeId) {
         BacklogTracerEventMessage msg = 
suspendedBreakpointMessages.get(nodeId);
         if (msg != null) {
@@ -198,9 +222,19 @@ public class BacklogDebugger extends ServiceSupport 
implements InterceptStrategy
     private final class NodeBreakpoint extends BreakpointSupport implements 
Condition {
 
         private final String nodeId;
+        private final boolean internal;
 
-        private NodeBreakpoint(String nodeId) {
+        private NodeBreakpoint(String nodeId, boolean internal) {
             this.nodeId = nodeId;
+            this.internal = internal;
+        }
+
+        public String getNodeId() {
+            return nodeId;
+        }
+
+        public boolean isInternal() {
+            return internal;
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/34974409/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java 
b/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java
index 56007b9..368b1ef 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java
@@ -33,6 +33,7 @@ public class BacklogDebuggerTest extends 
ManagementTestSupport {
         assertEquals("Should not be enabled", Boolean.FALSE, enabled);
 
         // TODO: add more to this test
+        Thread.sleep(999999);
     }
 
     @Override

Reply via email to