X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FHealthCheckController.java;h=cecbd9bdf89c47d0da380fe5c9a38dd8505897ae;hb=5312423cbaf998b8f104495833b3f019bffac204;hp=f1628e022333def6498c3b346af69991523105f7;hpb=d84a85d705b38d90b73809ead3e5034b8c066ca9;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
index f1628e02..cecbd9bd 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
@@ -164,12 +164,12 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
 			}
 
-			if (!HealthMonitor.isClusterStatusOk()) {
-				dbInfo.dbClusterStatus = "Problem, check the logs for more details";
-				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
-			} else {
-				dbInfo.dbClusterStatus = statusOk;
-			}
+//			if (!HealthMonitor.isClusterStatusOk()) {
+//				dbInfo.dbClusterStatus = "Problem, check the logs for more details";
+//				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
+//			} else {
+//				dbInfo.dbClusterStatus = statusOk;
+//			}
 
 			if (!HealthMonitor.isDatabasePermissionsOk()) {
 				dbInfo.dbPermissions = "Problem, check the logs for more details";
@@ -179,28 +179,31 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 			}
 			statusCollection.add(dbInfo);
 			
-			HealthStatusInfo CassandraStatusInfo = new HealthStatusInfo("Music-Cassandra");
-			//CassandraStatusInfo.hostName = EcompPortalUtils.getMyHostName();
-			CassandraStatusInfo.ipAddress = MusicUtil.getMyCassaHost();
-			
-			if (!HealthMonitor.isCassandraStatusOk()) {
-				overallStatus = false;
-				CassandraStatusInfo.healthCheckStatus = statusDown;
-				CassandraStatusInfo.description = "Check the logs for more details";
-				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckCassandraError);
-			}
-			statusCollection.add(CassandraStatusInfo);
-
-			HealthStatusInfo zookeeperStatusInfo = new HealthStatusInfo("Music-zookeeper");
-			//zookeeperStatusInfo.hostName = EcompPortalUtils.getMyHostName();
-			zookeeperStatusInfo.ipAddress = MusicUtil.getMyZkHost();
-			if (!HealthMonitor.isZookeeperStatusOk()) {
-				overallStatus = false;
-				zookeeperStatusInfo.healthCheckStatus = statusDown;
-				zookeeperStatusInfo.description = "Check the logs for more details";
-				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckZookeeperError);
+			org.onap.portalapp.music.util.MusicUtil MusicUtilSDK = new org.onap.portalapp.music.util.MusicUtil();
+			if(MusicUtilSDK.isMusicEnable()){
+				HealthStatusInfo CassandraStatusInfo = new HealthStatusInfo("Music-Cassandra");
+				//CassandraStatusInfo.hostName = EcompPortalUtils.getMyHostName();
+				CassandraStatusInfo.ipAddress = MusicUtil.getMyCassaHost();
+				
+				if (!HealthMonitor.isCassandraStatusOk()) {
+					overallStatus = false;
+					CassandraStatusInfo.healthCheckStatus = statusDown;
+					CassandraStatusInfo.description = "Check the logs for more details";
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckCassandraError);
+				}
+				statusCollection.add(CassandraStatusInfo);
+
+				HealthStatusInfo zookeeperStatusInfo = new HealthStatusInfo("Music-zookeeper");
+				//zookeeperStatusInfo.hostName = EcompPortalUtils.getMyHostName();
+				zookeeperStatusInfo.ipAddress = MusicUtil.getMyZkHost();
+				if (!HealthMonitor.isZookeeperStatusOk()) {
+					overallStatus = false;
+					zookeeperStatusInfo.healthCheckStatus = statusDown;
+					zookeeperStatusInfo.description = "Check the logs for more details";
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckZookeeperError);
+				}
+				statusCollection.add(zookeeperStatusInfo);
 			}
-			statusCollection.add(zookeeperStatusInfo);
 
 			String json = "";
 			try {