Repository: camel Updated Branches: refs/heads/master 55c570919 -> d5cd1344e
CAMEL-8044: Camel commands useable for remote JVMs using jolokia Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d5cd1344 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d5cd1344 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d5cd1344 Branch: refs/heads/master Commit: d5cd1344e2d1b544655997ee7dad5bf3dac2da96 Parents: 55c5709 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Dec 16 11:22:25 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Dec 16 11:22:25 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/commands/RestShowCommand.java | 4 ++-- .../org/apache/camel/commands/RouteProfileCommand.java | 12 ++++++------ .../org/apache/camel/commands/RouteShowCommand.java | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d5cd1344/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestShowCommand.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestShowCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestShowCommand.java index e2d3ea6..9d9dd17 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestShowCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestShowCommand.java @@ -32,9 +32,9 @@ public class RestShowCommand extends AbstractContextCommand { String xml = camelController.getRestModelAsXml(contextName); if (xml == null) { out.println("There are no REST services in CamelContext with name: " + contextName); - return null; + } else { + out.println(xml); } - out.println(xml); return null; } } http://git-wip-us.apache.org/repos/asf/camel/blob/d5cd1344/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteProfileCommand.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteProfileCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteProfileCommand.java index e0f0eb1..c6fc82e 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteProfileCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteProfileCommand.java @@ -54,17 +54,17 @@ public class RouteProfileCommand extends AbstractRouteCommand { // write new header for new camel context if (previousCamelContextName == null || !previousCamelContextName.equals(contextName)) { - System.out.println(""); - System.out.println(stringEscape.unescapeJava("\u001B[1mProfile\u001B[0m")); - System.out.println(stringEscape.unescapeJava("\tCamel Context: " + contextName)); - System.out.println(String.format(HEADER_FORMAT, "Id", "Count", "Last (ms)", "Delta (ms)", "Mean (ms)", "Min (ms)", "Max (ms)", "Total (ms)", "Self (ms)")); + out.println(""); + out.println(stringEscape.unescapeJava("\u001B[1mProfile\u001B[0m")); + out.println(stringEscape.unescapeJava("\tCamel Context: " + contextName)); + out.println(String.format(HEADER_FORMAT, "Id", "Count", "Last (ms)", "Delta (ms)", "Mean (ms)", "Min (ms)", "Max (ms)", "Total (ms)", "Self (ms)")); } String xml = camelController.getRouteStatsAsXml(routeId, contextName, true, true); RouteStatDump route = (RouteStatDump) unmarshaller.unmarshal(new StringReader(xml)); long count = route.getExchangesCompleted() + route.getExchangesFailed(); - System.out.println(String.format(OUTPUT_FORMAT, route.getId(), count, route.getLastProcessingTime(), route.getDeltaProcessingTime(), + out.println(String.format(OUTPUT_FORMAT, route.getId(), count, route.getLastProcessingTime(), route.getDeltaProcessingTime(), route.getMeanProcessingTime(), route.getMinProcessingTime(), route.getMaxProcessingTime(), route.getTotalProcessingTime(), route.getSelfProcessingTime())); for (ProcessorStatDump ps : route.getProcessorStats()) { @@ -72,7 +72,7 @@ public class RouteProfileCommand extends AbstractRouteCommand { long selfTime = ps.getTotalProcessingTime(); count = ps.getExchangesCompleted() + ps.getExchangesFailed(); // indent route id with 2 spaces - System.out.println(String.format(OUTPUT_FORMAT, " " + ps.getId(), count, ps.getLastProcessingTime(), ps.getDeltaProcessingTime(), + out.println(String.format(OUTPUT_FORMAT, " " + ps.getId(), count, ps.getLastProcessingTime(), ps.getDeltaProcessingTime(), ps.getMeanProcessingTime(), ps.getMinProcessingTime(), ps.getMaxProcessingTime(), ps.getAccumulatedProcessingTime(), selfTime)); } http://git-wip-us.apache.org/repos/asf/camel/blob/d5cd1344/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java index 9fea7e5..fc2f891 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java @@ -32,7 +32,8 @@ public class RouteShowCommand extends AbstractRouteCommand { String xml = camelController.getRouteModelAsXml(routeId, contextName); if (xml == null) { err.println("Definition of route " + routeId + " not found."); + } else { + out.println(xml); } - System.out.println(xml); } }
