[Amdatu-commits] SVN r602 - sandbox/ivol/cassandra-gadget/src/main/java/org/amdatu/cassandra/gadget/service

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Wed Jan 12 09:36:46 2011
New Revision: 602

Log:


Modified:
   
sandbox/ivol/cassandra-gadget/src/main/java/org/amdatu/cassandra/gadget/service/CassandraClientGadgetImpl.java

Modified: 
sandbox/ivol/cassandra-gadget/src/main/java/org/amdatu/cassandra/gadget/service/CassandraClientGadgetImpl.java
==============================================================================
--- 
sandbox/ivol/cassandra-gadget/src/main/java/org/amdatu/cassandra/gadget/service/CassandraClientGadgetImpl.java
      (original)
+++ 
sandbox/ivol/cassandra-gadget/src/main/java/org/amdatu/cassandra/gadget/service/CassandraClientGadgetImpl.java
      Wed Jan 12 09:36:46 2011
@@ -170,9 +170,9 @@
         String load = StorageService.instance.getLoadString();
         int clusterSize = StorageService.instance.getLiveNodes().size();
         String token = StorageService.instance.getToken();
-        String nodes = "";
+        String liveNodes = "";
         for (String node : StorageService.instance.getLiveNodes()) {
-            nodes += node + "<br/>";
+            liveNodes += node + "<br/>";
         }
         int rpcPort = DatabaseDescriptor.getRpcPort();
         String seeds = "";
@@ -182,11 +182,32 @@
         String listenAddress = 
inetAddressToString(DatabaseDescriptor.getListenAddress());
         String clusterName = DatabaseDescriptor.getClusterName();
         String initialToken = DatabaseDescriptor.getInitialToken();
+        String joiningNodes = "";
+        for (String joiningNode : StorageService.instance.getJoiningNodes()) {
+            joiningNodes += joiningNode + "<br/>";
+        }
+        String leavingNodes = "";
+        for (String leavingNode : StorageService.instance.getLeavingNodes()) {
+            leavingNodes += leavingNode + "<br/>";
+        }
+        String unreacheableNodes = "";
+        for (String node : StorageService.instance.getUnreachableNodes()) {
+            unreacheableNodes += node + "<br/>";
+        }
+        String operatingMode = StorageService.instance.getOperationMode();
+        boolean bootstrapMode = StorageService.instance.isBootstrapMode();
+        boolean clientMode = StorageService.instance.isClientMode();
 
         String html = "<table 
border=\"1\"><tr><th>Property</th><th>Value</th>";
         html += "<tr><td>Cluster name</td><td>" + clusterName + "</td></tr>";
         html += "<tr><td># Cluster nodes</td><td>" + clusterSize + 
"</td></tr>";
-        html += "<tr><td>Cluster nodes</td><td>" + nodes + "</td></tr>";
+        html += "<tr><td>Operating mode</td><td>" + operatingMode + 
"</td></tr>";
+        html += "<tr><td>Bootstrap mode</td><td>" + bootstrapMode + 
"</td></tr>";
+        html += "<tr><td>Client mode</td><td>" + clientMode + "</td></tr>";
+        html += "<tr><td>Live nodes</td><td>" + liveNodes + "</td></tr>";
+        html += "<tr><td>Joining nodes</td><td>" + joiningNodes + "</td></tr>";
+        html += "<tr><td>Leaving nodes</td><td>" + leavingNodes + "</td></tr>";
+        html += "<tr><td>Unreacheable nodes</td><td>" + unreacheableNodes + 
"</td></tr>";
         html += "<tr><td>Listen address</td><td>" + listenAddress + 
"</td></tr>";
         html += "<tr><td>RPC port</td><td>" + rpcPort + "</td></tr>";
         html += "<tr><td>Seeds of this node</td><td>" + seeds + "</td></tr>";