Code changes to fix cassandra issue

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / music / service / MusicService.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/music/service/MusicService.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/music/service/MusicService.java
index 119ad2d..a2951f1 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/music/service/MusicService.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/music/service/MusicService.java
@@ -80,16 +80,6 @@ public class MusicService {
        static RestTemplate template = new RestTemplate();
        private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicService.class);
        
-       static {        
-       try {
-                       //MusicCore.getDSHandle();
-                       init();
-                       // Since mDstoreHandle is already initialized in init mthod, calling this method again will have no impact on mDstoreHandle.
-                       MusicCore.getDSHandle();
-               } catch (MusicServiceException e) {
-                       logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(), e);
-               }
-    }
     
     public static void init() {
        try {
@@ -106,17 +96,23 @@ public class MusicService {
                 org.onap.music.main.MusicUtil.loadProperties();
                 // decrypt encrypted password using the key we loaded before.
                 String decryptedPassword = CipherUtil.decryptPKC(org.onap.music.main.MusicUtil.getCassPwd(), prop.getProperty("cipher.enc.key"));
+                logger.debug(EELFLoggerDelegate.debugLogger, "Successfully decrypted cassandra password ");
                 // set decrypted password 
                 org.onap.music.main.MusicUtil.setCassPwd(decryptedPassword);
                 // Here we are creating cassandra connections pool and sessions by calling MusicDataStore and passing the cassandrra hostname to that. 
                 MusicCore.mDstoreHandle = new MusicDataStore(org.onap.music.main.MusicUtil.getMyCassaHost());
+                logger.debug(EELFLoggerDelegate.debugLogger, "Successfully created cassandra connection pool ");
+                               // Since mDstoreHandle is already initialized in init mthod, calling this method again will have no impact on mDstoreHandle.
+                MusicCore.getDSHandle();
             } catch (Exception e) {
                logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(), e);
+               logger.debug(EELFLoggerDelegate.debugLogger, e.getMessage(), e);
             }
                
-               } catch(Exception e) {
-                       logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(), e);
-               }
+        } catch(Exception e) {
+               logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(), e);
+               logger.debug(EELFLoggerDelegate.debugLogger, e.getMessage(), e);
+        }
     }