[Amdatu-commits] SVN r599 - in sandbox/ivol/cassandra-gadget: . src/main/java/org/amdatu/cassandra/gadget/service

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Tue Jan 11 16:56:06 2011
New Revision: 599

Log:
added ring topology info

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

Modified: sandbox/ivol/cassandra-gadget/install.txt
==============================================================================
--- sandbox/ivol/cassandra-gadget/install.txt   (original)
+++ sandbox/ivol/cassandra-gadget/install.txt   Tue Jan 11 16:56:06 2011
@@ -1,6 +1,6 @@
 Windows:
 
-install 
file:D:\Amdatu-svn\sandbox\ivol\cassandra-gadget\org.amdatu.cassandra.gadget-0.1.0-SNAPSHOT.jar
+install 
file:D:\Amdatu-svn\sandbox\ivol\cassandra-gadget\target\org.amdatu.cassandra.gadget-0.1.0-SNAPSHOT.jar
 
 Linux:
 

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
      Tue Jan 11 16:56:06 2011
@@ -17,6 +17,7 @@
 package org.amdatu.cassandra.gadget.service;
 
 import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
 import java.net.URL;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -37,6 +38,7 @@
 import org.amdatu.opensocial.shindig.GadgetDefinition;
 import org.amdatu.web.httpcontext.HttpContextServiceFactory;
 import org.amdatu.web.httpcontext.ResourceProvider;
+import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.thrift.ColumnParent;
 import org.apache.cassandra.thrift.ConsistencyLevel;
@@ -172,12 +174,25 @@
         for (String node : StorageService.instance.getLiveNodes()) {
             nodes += node + "<br/>";
         }
+        int rpcPort = DatabaseDescriptor.getRpcPort();
+        String seeds = "";
+        for (InetAddress seed :  DatabaseDescriptor.getSeeds()) {
+            seeds += seed.toString() + "<br/>";
+        }
+        String listenAddress = 
DatabaseDescriptor.getListenAddress().toString();
+        String clusterName = DatabaseDescriptor.getClusterName();
+        String initialToken = DatabaseDescriptor.getInitialToken();
 
         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>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>";
         html += "<tr><td>Load of this node</td><td>" + load + "</td></tr>";
         html += "<tr><td>Token</td><td>" + token + "</td></tr>";
+        html += "<tr><td>Initial token</td><td>" + initialToken + "</td></tr>";
         html += "</table";
         return html;
     }