You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/06/04 11:00:25 UTC
[1/4] git commit: CAMEL-6384: Added BacklogDebugger MBean for live
debugging of Camel routes.
Updated Branches:
refs/heads/camel-2.11.x b739a43cf -> fffddef38
refs/heads/master fdd1f5bdf -> b22ac5c55
CAMEL-6384: Added BacklogDebugger MBean for live debugging of Camel routes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5e6bbba
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5e6bbba
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5e6bbba
Branch: refs/heads/master
Commit: f5e6bbbaaf878f11050bcdfa9639a5a7fc0551e1
Parents: fdd1f5b
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 10:56:57 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 10:56:57 2013 +0200
----------------------------------------------------------------------
.../mbean/ManagedBacklogDebuggerMBean.java | 5 ++++-
.../management/mbean/ManagedBacklogDebugger.java | 4 ++++
.../processor/interceptor/BacklogDebugger.java | 10 ++++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f5e6bbba/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 1df2e2c..02d2d96 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
@@ -44,9 +44,12 @@ public interface ManagedBacklogDebuggerMBean {
@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")
+ @ManagedOperation(description = "Remote the breakpoint from the given node id (will resume suspend breakpoint first)")
void removeBreakpoint(String nodeId);
+ @ManagedOperation(description = "Remote all breakpoints (will resume all suspend breakpoints first and exists single step mode)")
+ void removeAllBreakpoints();
+
@ManagedOperation(description = "Resume running from the suspended breakpoint at the given node id")
void resumeBreakpoint(String nodeId);
http://git-wip-us.apache.org/repos/asf/camel/blob/f5e6bbba/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 444e35d..eadedd7 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
@@ -80,6 +80,10 @@ public class ManagedBacklogDebugger implements ManagedBacklogDebuggerMBean {
backlogDebugger.removeBreakpoint(nodeId);
}
+ public void removeAllBreakpoints() {
+ backlogDebugger.removeAllBreakpoints();
+ }
+
public Set<String> getBreakpoints() {
return backlogDebugger.getBreakpoints();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f5e6bbba/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 b243968..c5f8337 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
@@ -39,6 +39,7 @@ import org.apache.camel.impl.DefaultDebugger;
import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ProcessorDefinitionHelper;
+import org.apache.camel.spi.Breakpoint;
import org.apache.camel.spi.Condition;
import org.apache.camel.spi.Debugger;
import org.apache.camel.spi.InterceptStrategy;
@@ -233,6 +234,15 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
}
}
+ public void removeAllBreakpoints() {
+ // stop single stepping
+ singleStepExchangeId = null;
+
+ for (String nodeId : getSuspendedBreakpointNodeIds()) {
+ removeBreakpoint(nodeId);
+ }
+ }
+
public Set<String> getBreakpoints() {
return new LinkedHashSet<String>(breakpoints.keySet());
}
[3/4] git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b22ac5c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b22ac5c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b22ac5c5
Branch: refs/heads/master
Commit: b22ac5c5511abf78513de6aad55ef0434b109c8d
Parents: 4aef130
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 10:59:42 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 10:59:42 2013 +0200
----------------------------------------------------------------------
.../component/direct/DirectBlockingProducer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b22ac5c5/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
index 1b28bed..003daa1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
@@ -58,7 +58,7 @@ public class DirectBlockingProducer extends DefaultAsyncProducer {
}
}
- protected DirectConsumer getConsumer(Exchange exchange) throws Exception {
+ protected DirectConsumer getConsumer(Exchange exchange) throws Exception {
DirectConsumer answer = endpoint.getConsumer();
if (answer == null) {
// okay then await until we have a consumer or we timed out
[2/4] git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4aef130f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4aef130f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4aef130f
Branch: refs/heads/master
Commit: 4aef130f60044f375980c6c1aea465da264e133e
Parents: f5e6bbb
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 10:57:59 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 10:59:10 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/StreamCache.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4aef130f/camel-core/src/main/java/org/apache/camel/StreamCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/StreamCache.java b/camel-core/src/main/java/org/apache/camel/StreamCache.java
index 615ad5b..26ef5be 100644
--- a/camel-core/src/main/java/org/apache/camel/StreamCache.java
+++ b/camel-core/src/main/java/org/apache/camel/StreamCache.java
@@ -30,7 +30,7 @@ import java.io.OutputStream;
*/
public interface StreamCache {
- public static final long DEFAULT_SPOOL_THRESHOLD = 128 * 1024;
+ long DEFAULT_SPOOL_THRESHOLD = 128 * 1024;
/**
* Resets the StreamCache for a new stream consumption.
[4/4] git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fffddef3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fffddef3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fffddef3
Branch: refs/heads/camel-2.11.x
Commit: fffddef38c488e9d1c8d5dbed0948341f3fdd7a4
Parents: b739a43
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 10:59:42 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 11:00:10 2013 +0200
----------------------------------------------------------------------
.../component/direct/DirectBlockingProducer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fffddef3/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
index 1b28bed..003daa1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
@@ -58,7 +58,7 @@ public class DirectBlockingProducer extends DefaultAsyncProducer {
}
}
- protected DirectConsumer getConsumer(Exchange exchange) throws Exception {
+ protected DirectConsumer getConsumer(Exchange exchange) throws Exception {
DirectConsumer answer = endpoint.getConsumer();
if (answer == null) {
// okay then await until we have a consumer or we timed out