JAMES-2004 Provide default values for Cassandra keyspace and replication factor
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ac3fb27c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ac3fb27c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ac3fb27c Branch: refs/heads/master Commit: ac3fb27c215dfc9027293d9fec92d9103a9c944f Parents: 9f7a4dc Author: benwa <btell...@linagora.com> Authored: Tue Apr 18 13:29:18 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Fri Apr 21 08:27:41 2017 +0700 ---------------------------------------------------------------------- .../apache/james/modules/mailbox/CassandraSessionModule.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/ac3fb27c/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java index 8b92f99..7180599 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java @@ -60,6 +60,8 @@ public class CassandraSessionModule extends AbstractModule { private static final int DEFAULT_CONNECTION_MAX_RETRIES = 10; private static final int DEFAULT_CONNECTION_MIN_DELAY = 5000; private static final long CASSANDRA_HIGHEST_TRACKABLE_LATENCY_MILLIS = TimeUnit.SECONDS.toMillis(10); + public static final int DEFAULT_REPLICATION_FACTOR = 1; + public static final String DEFAULT_KEYSPACE = "apache_james"; @Override protected void configure() { @@ -79,7 +81,7 @@ public class CassandraSessionModule extends AbstractModule { @Singleton Session provideSession(CassandraSessionConfiguration configuration, Cluster cluster, CassandraModule cassandraModule) throws FileNotFoundException, ConfigurationException{ - String keyspace = configuration.getConfiguration().getString("cassandra.keyspace"); + String keyspace = configuration.getConfiguration().getString("cassandra.keyspace", DEFAULT_KEYSPACE); return new SessionWithInitializedTablesFactory(cassandraModule).createSession(cluster, keyspace); } @@ -108,8 +110,8 @@ public class CassandraSessionModule extends AbstractModule { LOGGER.info("Trying to connect to Cassandra service"); return context -> ClusterWithKeyspaceCreatedFactory - .config(getCluster(servers, queryLoggerConfiguration), configuration.getString("cassandra.keyspace")) - .replicationFactor(configuration.getInt("cassandra.replication.factor")) + .config(getCluster(servers, queryLoggerConfiguration), configuration.getString("cassandra.keyspace", DEFAULT_KEYSPACE)) + .replicationFactor(configuration.getInt("cassandra.replication.factor", DEFAULT_REPLICATION_FACTOR)) .clusterWithInitializedKeyspace(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
