You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/05/11 13:57:23 UTC
svn commit: r1337121 - in
/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell:
NodesListCommand.java consumer/ConsumerSupport.java
producer/ProducerSupport.java
Author: jbonofre
Date: Fri May 11 11:57:22 2012
New Revision: 1337121
URL: http://svn.apache.org/viewvc?rev=1337121&view=rev
Log:
Cleanup some cluster:* commands output
Modified:
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java?rev=1337121&r1=1337120&r2=1337121&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java Fri May 11 11:57:22 2012
@@ -21,28 +21,22 @@ import java.util.Set;
@Command(scope = "cluster", name = "node-list", description = "List the cluster nodes.")
public class NodesListCommand extends ClusterCommandSupport {
- private static final String LIST_FORMAT = "%1s %4s %-20s %5s %s";
+ private static final String HEADER_FORMAT = " %30s %20s %5s";
+ private static final String OUTPUT_FORMAT = "%1s [%-30s] [%-20s] [%5s]";
@Override
protected Object doExecute() throws Exception {
- if (clusterManager == null) {
- System.err.println("Cluster Manager not found!");
- return null;
- } else {
- Set<Node> nodes = clusterManager.listNodes();
- if (nodes != null && !nodes.isEmpty()) {
- int count = 1;
- System.out.println(String.format(LIST_FORMAT, " ", "No.", "Host Name", "Port", "ID"));
- for (Node node : nodes) {
- String mark = " ";
- if (node.equals(clusterManager.getNode()))
- mark = "*";
- System.out.println(String.format(LIST_FORMAT, mark, count++, node.getHost(), node.getPort(), node.getId()));
- }
- } else {
- System.err.println("No node found in the cluster");
- return null;
+ Set<Node> nodes = clusterManager.listNodes();
+ if (nodes != null && !nodes.isEmpty()) {
+ System.out.println(String.format(HEADER_FORMAT, "ID", "Host Name", "Port"));
+ for (Node node : nodes) {
+ String mark = " ";
+ if (node.equals(clusterManager.getNode()))
+ mark = "*";
+ System.out.println(String.format(OUTPUT_FORMAT, mark, node.getId(), node.getHost(), node.getPort()));
}
+ } else {
+ System.err.println("No node found in the cluster");
}
return null;
}
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java?rev=1337121&r1=1337120&r2=1337121&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java Fri May 11 11:57:22 2012
@@ -63,7 +63,11 @@ public abstract class ConsumerSupport ex
System.out.println(String.format(HEADER_FORMAT, "Node", "Status"));
for (Node node : results.keySet()) {
ConsumerSwitchResult result = results.get(node);
- System.out.println(String.format(OUTPUT_FORMAT, node.getId(), result.getStatus()));
+ String statusString = "OFF";
+ if (result.getStatus()) {
+ statusString = "ON";
+ }
+ System.out.println(String.format(OUTPUT_FORMAT, node.getId(), statusString));
}
}
return null;
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java?rev=1337121&r1=1337120&r2=1337121&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java Fri May 11 11:57:22 2012
@@ -63,7 +63,11 @@ public abstract class ProducerSupport ex
System.out.println(String.format(HEADER_FORMAT, "Node", "Status"));
for (Node node : results.keySet()) {
ProducerSwitchResult result = results.get(node);
- System.out.println(String.format(OUTPUT_FORMAT, node.getId(), result.getStatus()));
+ String statusString = "OFF";
+ if (result.getStatus()) {
+ statusString = "ON";
+ }
+ System.out.println(String.format(OUTPUT_FORMAT, node.getId(), statusString));
}
}
return null;