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=d78d6146044bf8a03fff51721b4524293f287022;hb=ad4dc7cf7d0411a08733bfef27a6954a098f7052;hp=afb5de175eeebe6a31452df6d57717726f4976c6;hpb=24608a9e1450c409dc3870440d29e91cc3a26bb9;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 afb5de17..d78d6146 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
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ *  Modification Copyright © 2020 IBM.
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -46,8 +48,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.slf4j.MDC;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.onap.music.main.MusicUtil;
 import org.onap.portalapp.controller.EPUnRestrictedBaseController;
 import org.onap.portalapp.portal.listener.HealthMonitor;
 import org.onap.portalapp.portal.logging.aop.EPAuditLog;
@@ -117,12 +121,12 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 	private final String statusDown = "DOWN";
 	private final String statusOk = "OK";
 
-	@RequestMapping(value = { "/portalApi/healthCheck" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/portalApi/healthCheck" }, produces = "application/json")
 	public HealthStatus healthCheck(HttpServletRequest request, HttpServletResponse response) {
 		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,
@@ -163,14 +167,14 @@ 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 {
@@ -178,16 +182,31 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 			}
 			statusCollection.add(dbInfo);
 
-			HealthStatusInfo uebInfo = new HealthStatusInfo("UEB");
-			if (!HealthMonitor.isUebUp()) {
-				// As per test case review meeting, UEB is considered as
-				// critical as DB. Hence commenting
-				// overallStatus = false;
-				uebInfo.healthCheckStatus = statusDown;
-				uebInfo.description = "Check the logs for more details";
-				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUebConnectionError);
+			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(uebInfo);
 
 			String json = "";
 			try {
@@ -213,12 +232,12 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 		return healthStatus;
 	}
 
-	@RequestMapping(value = {
-			"/portalApi/healthCheckSuspend" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/healthCheckSuspend" }, produces = "application/json")
 	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 =",
@@ -227,19 +246,19 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
 		return healthStatus;
 	}
 
-	@RequestMapping(value = {
-			"/portalApi/healthCheckResume" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/healthCheckResume" }, produces = "application/json")
 	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());
 		return healthStatus;
 	}
 
-	@RequestMapping(value = { "/portalApi/ping" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/portalApi/ping" }, produces = "application/json")
 	public HealthStatus ping(HttpServletRequest request, HttpServletResponse response) {
 		HealthStatus healthStatus = new HealthStatus(200, "OK");
 		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/ping", "GET result =", response.getStatus());