Skip to content

Commit

Permalink
CAMEL-8223: Inflight repository to allow browsing of current inflight…
Browse files Browse the repository at this point in the history 
… exchanges
  • Loading branch information
@davsclaus
davsclaus committed Jan 12, 2015
1 parent c98ca02 commit e1e8de5
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 25 deletions.
6 changes: 3 additions & 3 deletions camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
View file
Expand Up @@ -127,9 +127,9 @@ public static TabularType listInflightExchangesTabularType() throws OpenDataExce
}

public static CompositeType listInflightExchangesCompositeType() throws OpenDataException {
return new CompositeType("exchanges", "Exchanges", new String[]{"exchangeId", "routeId", "nodeId", "duration", "elapsed"},
new String[]{"Exchange Id", "RouteId", "NodeId", "Duration", "Elapsed"},
new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
return new CompositeType("exchanges", "Exchanges", new String[]{"exchangeId", "fromRouteId", "routeId", "nodeId", "elapsed", "duration"},
new String[]{"Exchange Id", "From RouteId", "RouteId", "NodeId", "Elapsed", "Duration"},
new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
}

}
7 changes: 4 additions & 3 deletions camel-core/src/main/java/org/apache/camel/management/mbean/ManagedInflightRepository.java
View file
Expand Up @@ -71,14 +71,15 @@ public TabularData browse(int limit, boolean sortByLongestDuration) {
for (InflightRepository.InflightExchange entry : exchanges) {
CompositeType ct = CamelOpenMBeanTypes.listInflightExchangesCompositeType();
String exchangeId = entry.getExchange().getExchangeId();
String fromRouteId = entry.getExchange().getFromRouteId();
String routeId = entry.getRouteId();
String nodeId = entry.getNodeId();
String duration = "" + entry.getDuration();
String elapsed = "" + entry.getElapsed();
String duration = "" + entry.getDuration();

CompositeData data = new CompositeDataSupport(ct,
new String[]{"exchangeId", "routeId", "nodeId", "duration", "elapsed"},
new Object[]{exchangeId, routeId, nodeId, duration, elapsed});
new String[]{"exchangeId", "fromRouteId", "routeId", "nodeId", "elapsed", "duration"},
new Object[]{exchangeId, fromRouteId, routeId, nodeId, elapsed, duration});
answer.put(data);
}
return answer;
Expand Down
12 changes: 8 additions & 4 deletions ...s/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
View file
Expand Up @@ -192,6 +192,10 @@ public List<Map<String, Object>> browseInflightExchanges(String camelContextName
if (exchangeId != null) {
row.put("exchangeId", exchangeId);
}
Object fromRouteId = data.get("fromRouteId");
if (fromRouteId != null) {
row.put("fromRouteId", fromRouteId);
}
Object routeId = data.get("routeId");
if (routeId != null) {
row.put("routeId", routeId);
Expand All @@ -200,14 +204,14 @@ public List<Map<String, Object>> browseInflightExchanges(String camelContextName
if (nodeId != null) {
row.put("nodeId", nodeId);
}
Object duration = data.get("duration");
if (duration != null) {
row.put("duration", duration);
}
Object elapsed = data.get("elapsed");
if (elapsed != null) {
row.put("elapsed", elapsed);
}
Object duration = data.get("duration");
if (duration != null) {
row.put("duration", duration);
}
answer.add(row);
}
}
Expand Down
38 changes: 24 additions & 14 deletions ...ommands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java
View file
Expand Up @@ -27,10 +27,11 @@
public class ContextInflightCommand extends AbstractContextCommand {

private static final String EXCHANGE_COLUMN_LABEL = "ExchangeId";
private static final String FROM_ROUTE_COLUMN_LABEL = "From Route";
private static final String ROUTE_COLUMN_LABEL = "Route";
private static final String NODE_COLUMN_LABEL = "Node";
private static final String DURATION_COLUMN_LABEL = "Duration (ms)";
private static final String ELAPSED_COLUMN_LABEL = "Elapsed (ms)";
private static final String DURATION_COLUMN_LABEL = "Duration (ms)";

private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
private static final String DEFAULT_FIELD_PREAMBLE = " ";
Expand Down Expand Up @@ -59,15 +60,16 @@ protected Object performContextCommand(CamelController camelController, String c
final String rowFormat = buildFormatString(columnWidths, false);

if (inflight.size() > 0) {
out.println(String.format(headerFormat, EXCHANGE_COLUMN_LABEL, ROUTE_COLUMN_LABEL, NODE_COLUMN_LABEL, DURATION_COLUMN_LABEL, ELAPSED_COLUMN_LABEL));
out.println(String.format(headerFormat, "----------", "-----", "----", "-------------", "------------"));
out.println(String.format(headerFormat, EXCHANGE_COLUMN_LABEL, FROM_ROUTE_COLUMN_LABEL, ROUTE_COLUMN_LABEL, NODE_COLUMN_LABEL, ELAPSED_COLUMN_LABEL, DURATION_COLUMN_LABEL));
out.println(String.format(headerFormat, "----------", "----------", "-----", "----", "------------", "-------------"));
for (Map<String, Object> row : inflight) {
Object exchangeId = row.get("exchangeId");
Object fromRouteId = row.get("fromRouteId");
Object routeId = row.get("routeId");
Object state = row.get("nodeId");
Object duration = row.get("duration");
Object nodeId = row.get("nodeId");
Object elapsed = row.get("elapsed");
out.println(String.format(rowFormat, exchangeId, routeId, state, safeNull(duration), safeNull(elapsed)));
Object duration = row.get("duration");
out.println(String.format(rowFormat, exchangeId, fromRouteId, routeId, nodeId, safeNull(elapsed), safeNull(duration)));
}
}

Expand All @@ -79,34 +81,39 @@ private Map<String, Integer> computeColumnWidths(final Iterable<Map<String, Obje
throw new IllegalArgumentException("Unable to determine column widths from null Iterable<Inflight>");
} else {
int maxExchangeLen = 0;
int maxFromRouteLen = 0;
int maxRouteLen = 0;
int maxNodeLen = 0;
int maxDurationLen = 0;
int maxElapsedLen = 0;
int maxDurationLen = 0;

for (Map<String, Object> row : inflight) {
final String exchangeId = safeNull(row.get("exchangeId"));
maxExchangeLen = java.lang.Math.max(maxExchangeLen, exchangeId == null ? 0 : exchangeId.length());

final String fromRouteId = safeNull(row.get("fromRouteId"));
maxFromRouteLen = java.lang.Math.max(maxFromRouteLen, fromRouteId == null ? 0 : fromRouteId.length());

final String routeId = safeNull(row.get("routeId"));
maxRouteLen = java.lang.Math.max(maxRouteLen, routeId == null ? 0 : routeId.length());

final String nodeId = safeNull(row.get("nodeId"));
maxNodeLen = java.lang.Math.max(maxNodeLen, nodeId == null ? 0 : nodeId.length());

final String duration = safeNull(row.get("duration"));
maxDurationLen = java.lang.Math.max(maxDurationLen, duration == null ? 0 : duration.length());

final String elapsed = safeNull(row.get("elapsed"));
maxElapsedLen = java.lang.Math.max(maxElapsedLen, elapsed == null ? 0 : elapsed.length());

final String duration = safeNull(row.get("duration"));
maxDurationLen = java.lang.Math.max(maxDurationLen, duration == null ? 0 : duration.length());
}

final Map<String, Integer> retval = new Hashtable<String, Integer>(5);
retval.put(EXCHANGE_COLUMN_LABEL, maxExchangeLen);
retval.put(FROM_ROUTE_COLUMN_LABEL, maxFromRouteLen);
retval.put(ROUTE_COLUMN_LABEL, maxRouteLen);
retval.put(NODE_COLUMN_LABEL, maxNodeLen);
retval.put(DURATION_COLUMN_LABEL, maxDurationLen);
retval.put(ELAPSED_COLUMN_LABEL, maxElapsedLen);
retval.put(DURATION_COLUMN_LABEL, maxDurationLen);

return retval;
}
Expand All @@ -127,22 +134,25 @@ private static String buildFormatString(final Map<String, Integer> columnWidths,
columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;

int exchangeLen = Math.min(columnWidths.get(EXCHANGE_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
int fromRouteLen = Math.min(columnWidths.get(FROM_ROUTE_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
int routeLen = Math.min(columnWidths.get(ROUTE_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
int nodeLen = Math.min(columnWidths.get(NODE_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
int durationLen = Math.min(columnWidths.get(DURATION_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
int elapsedLen = Math.min(columnWidths.get(ELAPSED_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
int durationLen = Math.min(columnWidths.get(DURATION_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
exchangeLen = Math.max(MIN_COLUMN_WIDTH, exchangeLen);
fromRouteLen = Math.max(MIN_COLUMN_WIDTH, fromRouteLen);
routeLen = Math.max(MIN_COLUMN_WIDTH, routeLen);
nodeLen = Math.max(MIN_COLUMN_WIDTH, nodeLen);
durationLen = Math.max(13, durationLen);
elapsedLen = Math.max(MIN_COLUMN_WIDTH, elapsedLen);
durationLen = Math.max(13, durationLen);

final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
retval.append(fieldPreamble).append("%-").append(exchangeLen).append('.').append(exchangeLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(fromRouteLen).append('.').append(fromRouteLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(routeLen).append('.').append(routeLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(nodeLen).append('.').append(nodeLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%").append(durationLen).append('.').append(durationLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%").append(elapsedLen).append('.').append(elapsedLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%").append(durationLen).append('.').append(durationLen).append('s').append(fieldPostamble).append(' ');

return retval.toString();
}
Expand Down
3 changes: 2 additions & 1 deletion ...olokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
View file
Expand Up @@ -246,10 +246,11 @@ public List<Map<String, Object>> browseInflightExchanges(String camelContextName

Map<String, Object> row = new LinkedHashMap<String, Object>();
row.put("exchangeId", asString(inflight.get("exchangeId")));
row.put("fromRouteId", asString(inflight.get("fromRouteId")));
row.put("routeId", asString(inflight.get("routeId")));
row.put("nodeId", asString(inflight.get("nodeId")));
row.put("duration", asString(inflight.get("duration")));
row.put("elapsed", asString(inflight.get("elapsed")));
row.put("duration", asString(inflight.get("duration")));
answer.add(row);
}
}
Expand Down

0 comments on commit e1e8de5

Please sign in to comment.