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;
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,
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 {
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 =",
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());