JAMES-2122 Adding a log on Cassandra cluster fallback
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bc50d81a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bc50d81a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bc50d81a Branch: refs/heads/master Commit: bc50d81afd4eec1dbd9246060b5b6822005b5340 Parents: aa5cefd Author: benwa <btell...@linagora.com> Authored: Thu Aug 17 10:25:55 2017 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Thu Aug 17 13:13:33 2017 +0200 ---------------------------------------------------------------------- .../james/backends/cassandra/init/ClusterBuilder.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/bc50d81a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java index 4641ac0..18e8749 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java @@ -23,6 +23,8 @@ import java.util.Collection; import java.util.Optional; import org.apache.james.util.Host; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.PoolingOptions; @@ -32,7 +34,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; public class ClusterBuilder { - + private static final Logger LOGGER = LoggerFactory.getLogger(ClusterBuilder.class); private final static String DEFAULT_CLUSTER_IP = "localhost"; public static final int DEFAULT_CASSANDRA_PORT = 9042; @@ -189,8 +191,14 @@ public class ClusterBuilder { } private Collection<Host> getServersFromHostAndPort() { - String host = this.host.orElse(DEFAULT_CLUSTER_IP); - int port = this.port.orElse(DEFAULT_CASSANDRA_PORT); + String host = this.host.orElseGet(() -> { + LOGGER.info("No cassandra host specified. Falling back to {}", DEFAULT_CLUSTER_IP); + return DEFAULT_CLUSTER_IP; + }); + int port = this.port.orElseGet(() -> { + LOGGER.info("No cassandra port specified. Falling back to {}", DEFAULT_CASSANDRA_PORT); + return DEFAULT_CASSANDRA_PORT; + }); return ImmutableList.of(Host.from(host, port)); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org