Author: brandonwilliams Date: Thu Mar 17 02:58:45 2011 New Revision: 1082388
URL: http://svn.apache.org/viewvc?rev=1082388&view=rev Log: Allow configured ports and initial token to be overridden by system properties. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2343 Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=1082388&r1=1082387&r2=1082388&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Thu Mar 17 02:58:45 2011 @@ -758,7 +758,7 @@ public class DatabaseDescriptor public static String getInitialToken() { - return conf.initial_token; + return System.getProperty("cassandra.initial_token", conf.initial_token); } public static String getClusterName() @@ -825,12 +825,12 @@ public class DatabaseDescriptor public static int getStoragePort() { - return conf.storage_port; + return Integer.parseInt(System.getProperty("cassandra.storage_port", conf.storage_port.toString())); } public static int getRpcPort() { - return conf.rpc_port; + return Integer.parseInt(System.getProperty("cassandra.rpc_port", conf.rpc_port.toString())); } public static long getRpcTimeout()
