Author: ivol37 at gmail.com
Date: Wed Jan 12 09:13:24 2011
New Revision: 601
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:13:24 2011
@@ -177,10 +177,9 @@
int rpcPort = DatabaseDescriptor.getRpcPort();
String seeds = "";
for (InetAddress seed : DatabaseDescriptor.getSeeds()) {
- seeds += seed.getHostAddress() + " (" +
seed.getCanonicalHostName() + ")<br/>";
+ seeds += inetAddressToString(seed) + "<br/>";
}
- String listenAddress =
DatabaseDescriptor.getListenAddress().getHostAddress() + " ("
- + DatabaseDescriptor.getListenAddress().getCanonicalHostName() + ")";
+ String listenAddress =
inetAddressToString(DatabaseDescriptor.getListenAddress());
String clusterName = DatabaseDescriptor.getClusterName();
String initialToken = DatabaseDescriptor.getInitialToken();
@@ -262,4 +261,14 @@
+ "' in getRowKeys");
return keys;
}
+
+ private String inetAddressToString(InetAddress address) {
+ String result = address.getHostAddress();
+ if (!address.getCanonicalHostName().equals(address.getHostAddress())) {
+ result += "(" + address.getCanonicalHostName() + ")";
+ } else if (!address.getHostName().equals(address.getHostAddress())) {
+ result += "(" + address.getHostName() + ")";
+ }
+ return result;
+ }
}
\ No newline at end of file
