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 2014/12/10 17:32:24 UTC
[14/15] camel git commit: CAMEL-8044: Include state in xml dumps from
jmx api
CAMEL-8044: Include state in xml dumps from jmx api
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e695d0da
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e695d0da
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e695d0da
Branch: refs/heads/master
Commit: e695d0da3194cf1584827cad8e2a13a5d887217f
Parents: f12797c
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 10 16:14:16 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 10 16:14:16 2014 +0100
----------------------------------------------------------------------
.../camel/management/mbean/ManagedCamelContext.java | 6 +++---
.../org/apache/camel/management/mbean/ManagedRoute.java | 8 +++-----
.../java/org/apache/camel/util/ProcessorStatDump.java | 11 +++++++++++
.../main/java/org/apache/camel/util/RouteStatDump.java | 11 +++++++++++
4 files changed, 28 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e695d0da/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 69593eb..f3d2be5 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
@@ -370,7 +370,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
public String dumpRoutesStatsAsXml(boolean fullStats, boolean includeProcessors) throws Exception {
StringBuilder sb = new StringBuilder();
- sb.append("<camelContextStat").append(String.format(" id=\"%s\"", getCamelId()));
+ sb.append("<camelContextStat").append(String.format(" id=\"%s\" state=\"%s\"", getCamelId(), getState()));
// use substring as we only want the attributes
String stat = dumpStatsAsXml(fullStats);
sb.append(" ").append(stat.substring(7, stat.length() - 2)).append(">\n");
@@ -397,7 +397,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
sb.append(" <routeStats>\n");
for (ObjectName on : routes) {
ManagedRouteMBean route = MBeanServerInvocationHandler.newProxyInstance(server, on, ManagedRouteMBean.class, true);
- sb.append(" <routeStat").append(String.format(" id=\"%s\"", route.getRouteId()));
+ sb.append(" <routeStat").append(String.format(" id=\"%s\" state=\"%s\"", route.getRouteId(), route.getState()));
// use substring as we only want the attributes
stat = route.dumpStatsAsXml(fullStats);
sb.append(" ").append(stat.substring(7, stat.length() - 2)).append(">\n");
@@ -408,7 +408,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
for (ManagedProcessorMBean processor : processors) {
// the processor must belong to this route
if (route.getRouteId().equals(processor.getRouteId())) {
- sb.append(" <processorStat").append(String.format(" id=\"%s\"", processor.getProcessorId()));
+ sb.append(" <processorStat").append(String.format(" id=\"%s\" index=\"%s\" state=\"%s\"", processor.getProcessorId(), processor.getIndex(), processor.getState()));
// use substring as we only want the attributes
sb.append(" ").append(processor.dumpStatsAsXml(fullStats).substring(7)).append("\n");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e695d0da/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 5b4a07a..a0bdfb1 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
@@ -303,7 +303,7 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList
// and now add the sorted list of processors to the xml output
for (ManagedProcessorMBean processor : mps) {
- sb.append(" <processorStat").append(String.format(" id=\"%s\" index=\"%s\"", processor.getProcessorId(), processor.getIndex()));
+ sb.append(" <processorStat").append(String.format(" id=\"%s\" index=\"%s\" state=\"%s\"", processor.getProcessorId(), processor.getIndex(), processor.getState()));
// do we have an accumulated time then append that
Long accTime = accumulatedTimes.get(processor.getProcessorId());
if (accTime != null) {
@@ -323,13 +323,11 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList
routeSelfTime = 0;
}
- int inflight = context.getInflightRepository().size(getRouteId());
-
StringBuilder answer = new StringBuilder();
- answer.append("<routeStat").append(String.format(" id=\"%s\"", route.getId()));
+ answer.append("<routeStat").append(String.format(" id=\"%s\"", route.getId())).append(String.format(" state=\"%s\"", getState()));
// use substring as we only want the attributes
String stat = dumpStatsAsXml(fullStats);
- answer.append(" exchangesInflight=\"").append(inflight).append("\"");
+ answer.append(" exchangesInflight=\"").append(getInflightExchanges()).append("\"");
answer.append(" selfProcessingTime=\"").append(routeSelfTime).append("\"");
answer.append(" ").append(stat.substring(7, stat.length() - 2)).append(">\n");
http://git-wip-us.apache.org/repos/asf/camel/blob/e695d0da/camel-core/src/main/java/org/apache/camel/util/ProcessorStatDump.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/ProcessorStatDump.java b/camel-core/src/main/java/org/apache/camel/util/ProcessorStatDump.java
index b554476..000613e 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ProcessorStatDump.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ProcessorStatDump.java
@@ -35,6 +35,9 @@ public final class ProcessorStatDump {
private Integer index;
@XmlAttribute
+ private String state;
+
+ @XmlAttribute
private Long exchangesCompleted;
@XmlAttribute
@@ -110,6 +113,14 @@ public final class ProcessorStatDump {
this.index = index;
}
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
public Long getExchangesCompleted() {
return exchangesCompleted;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e695d0da/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java b/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java
index 7b171e0..4a05413 100644
--- a/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java
+++ b/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java
@@ -36,6 +36,9 @@ public final class RouteStatDump {
private String id;
@XmlAttribute
+ private String state;
+
+ @XmlAttribute
private Long exchangesCompleted;
@XmlAttribute
@@ -112,6 +115,14 @@ public final class RouteStatDump {
this.id = id;
}
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
public Long getExchangesCompleted() {
return exchangesCompleted;
}