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=6818d5052cb03b189f6bce8851f30d4a1f15168d;hb=3f56b9fdb4d2ec891344d6c9048363e1cac587d2;hp=f1628e022333def6498c3b346af69991523105f7;hpb=2edaa4d6a5f7066e0c718f85a7bf7b8dabd0c59b;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..6818d505 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
@@ -123,7 +123,7 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 		HealthStatus healthStatus = new HealthStatus(500, "");
 
 		// Return the status as 500 if it suspended due to manual fail over
-		if (HealthMonitor.isSuspended) {
+		if (HealthMonitor.isSuspended()) {
 			healthStatus.body = "Suspended";
 			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 			MDC.put(EPCommonSystemProperties.RESPONSE_CODE,
@@ -164,43 +164,45 @@ 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()) {
+			if (!HealthMonitor.isDbPermissionsOk()) {
 				dbInfo.dbPermissions = "Problem, check the logs for more details";
 				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
 			} else {
 				dbInfo.dbPermissions = statusOk;
 			}
 			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);
+			if(org.onap.portalapp.music.util.MusicUtil.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 {
@@ -231,7 +233,7 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 	public HealthStatus healthCheckSuspend(HttpServletRequest request, HttpServletResponse response) {
 		HealthStatus healthStatus = new HealthStatus(500, "Suspended for manual failover mechanism");
 
-		HealthMonitor.isSuspended = true;
+		HealthMonitor.setSuspended(true);
 		healthStatus.statusCode = 200;
 
 		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/healthCheckSuspend", "GET result =",
@@ -245,7 +247,7 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 	public HealthStatus healthCheckResume(HttpServletRequest request, HttpServletResponse response) {
 		HealthStatus healthStatus = new HealthStatus(500, "Resumed from manual failover mechanism");
 
-		HealthMonitor.isSuspended = false;
+		HealthMonitor.setSuspended(false);
 		healthStatus.statusCode = 200;
 		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/healthCheckResume", "GET result =",
 				response.getStatus());