Updated Branches: refs/heads/trunk 29353b8aa -> ec14be929
rename Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec14be92 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec14be92 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec14be92 Branch: refs/heads/trunk Commit: ec14be929cac7275dcd39a792c8b6e64bf102abc Parents: 480cb2f Author: Jonathan Ellis <[email protected]> Authored: Thu Sep 27 15:56:55 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Sep 28 09:37:54 2012 -0500 ---------------------------------------------------------------------- .../locator/GossipingPropertyFileSnitch.java | 4 ++-- .../cassandra/locator/PropertyFileSnitch.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec14be92/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java index adc8b24..c66e0f9 100644 --- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java @@ -54,11 +54,11 @@ public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch try { psnitch = new PropertyFileSnitch(); - logger.info("Loaded " + PropertyFileSnitch.RACK_PROPERTY_FILENAME + " for compatibility"); + logger.info("Loaded " + PropertyFileSnitch.SNITCH_PROPERTIES_FILENAME + " for compatibility"); } catch (ConfigurationException e) { - logger.info("Unable to load " + PropertyFileSnitch.RACK_PROPERTY_FILENAME + "; compatibility mode disabled"); + logger.info("Unable to load " + PropertyFileSnitch.SNITCH_PROPERTIES_FILENAME + "; compatibility mode disabled"); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec14be92/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java index 4e9b44a..d337b58 100644 --- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java @@ -48,7 +48,7 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch { private static final Logger logger = LoggerFactory.getLogger(PropertyFileSnitch.class); - public static final String RACK_PROPERTY_FILENAME = "cassandra-topology.properties"; + public static final String SNITCH_PROPERTIES_FILENAME = "cassandra-topology.properties"; private static volatile Map<InetAddress, String[]> endpointMap; private static volatile String[] defaultDCRack; @@ -59,7 +59,7 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch try { - FBUtilities.resourceToFile(RACK_PROPERTY_FILENAME); + FBUtilities.resourceToFile(SNITCH_PROPERTIES_FILENAME); Runnable runnable = new WrappedRunnable() { protected void runMayThrow() throws ConfigurationException @@ -67,11 +67,11 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch reloadConfiguration(); } }; - ResourceWatcher.watch(RACK_PROPERTY_FILENAME, runnable, 60 * 1000); + ResourceWatcher.watch(SNITCH_PROPERTIES_FILENAME, runnable, 60 * 1000); } catch (ConfigurationException ex) { - logger.debug(RACK_PROPERTY_FILENAME + " found, but does not look like a plain file. Will not watch it for changes"); + logger.debug(SNITCH_PROPERTIES_FILENAME + " found, but does not look like a plain file. Will not watch it for changes"); } } @@ -134,12 +134,12 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch InputStream stream = null; try { - stream = getClass().getClassLoader().getResourceAsStream(RACK_PROPERTY_FILENAME); + stream = getClass().getClassLoader().getResourceAsStream(SNITCH_PROPERTIES_FILENAME); properties.load(stream); } catch (Exception e) { - throw new ConfigurationException("Unable to read " + RACK_PROPERTY_FILENAME, e); + throw new ConfigurationException("Unable to read " + SNITCH_PROPERTIES_FILENAME, e); } finally { @@ -178,7 +178,7 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch } if (!reloadedMap.containsKey(FBUtilities.getBroadcastAddress())) throw new ConfigurationException(String.format("Snitch definitions at %s do not define a location for this node's broadcast address %s", - RACK_PROPERTY_FILENAME, FBUtilities.getBroadcastAddress())); + SNITCH_PROPERTIES_FILENAME, FBUtilities.getBroadcastAddress())); logger.debug("loaded network topology {}", FBUtilities.toString(reloadedMap)); endpointMap = reloadedMap;
