aboutsummaryrefslogtreecommitdiffstats
path: root/jar/src/main/java/org/onap/music/datastore
diff options
context:
space:
mode:
authorNelson, Thomas (tn1381) <tn1381@att.com>2019-06-19 17:24:19 -0400
committerNelson, Thomas (tn1381) <tn1381@att.com>2019-06-19 17:24:19 -0400
commit32c90064cd24a03e1037639016e2e98a7ef8ae83 (patch)
tree6fce3e59c4a71c064b45866ca04a562e14cf7285 /jar/src/main/java/org/onap/music/datastore
parent078f69315e4b4faffc50e1c7dfde717396e48194 (diff)
Fix missed Log output
Issue-ID: MUSIC-406 Signed-off-by: Nelson, Thomas (tn1381) <tn1381@att.com> Change-Id: I5a835b1bec73764b77b2e354284be98b7e87f919
Diffstat (limited to 'jar/src/main/java/org/onap/music/datastore')
-rw-r--r--jar/src/main/java/org/onap/music/datastore/MusicDataStore.java36
1 files changed, 16 insertions, 20 deletions
diff --git a/jar/src/main/java/org/onap/music/datastore/MusicDataStore.java b/jar/src/main/java/org/onap/music/datastore/MusicDataStore.java
index 2fbca444..3cd8baeb 100644
--- a/jar/src/main/java/org/onap/music/datastore/MusicDataStore.java
+++ b/jar/src/main/java/org/onap/music/datastore/MusicDataStore.java
@@ -168,20 +168,18 @@ public class MusicDataStore {
.setConnectionsPerHost(HostDistance.REMOTE, 2, 4);
while (it.hasNext()) {
try {
- if(MusicUtil.getCassName() != null && MusicUtil.getCassPwd() != null) {
- logger.info(EELFLoggerDelegate.applicationLogger,
- "Building with credentials "+MusicUtil.getCassName()+" & "+MusicUtil.getCassPwd());
+ if(MusicUtil.getCassName() != null && MusicUtil.getCassPwd() != null) {
cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort())
- .withCredentials(MusicUtil.getCassName(), MusicUtil.getCassPwd())
+ .withCredentials(MusicUtil.getCassName(), MusicUtil.getCassPwd())
//.withLoadBalancingPolicy(new RoundRobinPolicy())
- .withoutJMXReporting()
- .withPoolingOptions(poolingOptions)
- .addContactPoints(addresses).build();
+ .withoutJMXReporting()
+ .withPoolingOptions(poolingOptions)
+ .addContactPoints(addresses).build();
}
else
cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort())
//.withLoadBalancingPolicy(new RoundRobinPolicy())
- .addContactPoints(addresses).build();
+ .addContactPoints(addresses).build();
Metadata metadata = cluster.getMetadata();
logger.info(EELFLoggerDelegate.applicationLogger, "Connected to cassa cluster "
@@ -213,19 +211,15 @@ public class MusicDataStore {
addresses = address.split(",");
PoolingOptions poolingOptions = new PoolingOptions();
poolingOptions
- .setConnectionsPerHost(HostDistance.LOCAL, 4, 10)
- .setConnectionsPerHost(HostDistance.REMOTE, 2, 4);
+ .setConnectionsPerHost(HostDistance.LOCAL, 4, 10)
+ .setConnectionsPerHost(HostDistance.REMOTE, 2, 4);
if(MusicUtil.getCassName() != null && MusicUtil.getCassPwd() != null) {
- logger.info(EELFLoggerDelegate.applicationLogger,
- "Building with credentials "+MusicUtil.getCassName()+" & "+MusicUtil.getCassPwd());
cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort())
- .withCredentials(MusicUtil.getCassName(), MusicUtil.getCassPwd())
- //.withLoadBalancingPolicy(new RoundRobinPolicy())
- .withoutJMXReporting()
- .withPoolingOptions(poolingOptions)
- .addContactPoints(addresses).build();
- }
- else {
+ .withCredentials(MusicUtil.getCassName(), MusicUtil.getCassPwd())
+ .withoutJMXReporting()
+ .withPoolingOptions(poolingOptions)
+ .addContactPoints(addresses).build();
+ } else {
cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort())
//.withLoadBalancingPolicy(new RoundRobinPolicy())
.withoutJMXReporting()
@@ -238,7 +232,9 @@ public class MusicDataStore {
try {
session = cluster.connect();
} catch (Exception ex) {
- logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(),AppMessages.CASSANDRACONNECTIVITY, ErrorSeverity.ERROR, ErrorTypes.SERVICEUNAVAILABLE);
+ logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(),
+ AppMessages.CASSANDRACONNECTIVITY,
+ ErrorSeverity.ERROR, ErrorTypes.SERVICEUNAVAILABLE);
throw new MusicServiceException(
"Error while connecting to Cassandra cluster.. " + ex.getMessage());
}