Merge pull request #197 from urviljoshi/heathcheck-consolidator

503 respstatus added in case of status as down
mosip · Aug 19, 2022 · 8b6cc5f · 8b6cc5f
2 parents aa6f064 + 8c49369
commit 8b6cc5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/consolidator/consolidator_service.bal b/consolidator/consolidator_service.bal
@@ -29,7 +29,7 @@ import ballerina/jballerina.java;
 
 http:Service healthCheckService = service object {
 
-    resource function get .() returns healthcheck:HealthCheckResp {
+    resource function get .() returns http:Ok|http:ServiceUnavailable {
         //diskspace
         string diskSpaceStatus = "DOWN";
         handle handleStr = java:fromString(config:CURRENT_WORKING_DIR);
@@ -59,11 +59,15 @@ http:Service healthCheckService = service object {
         string resultStatus = "DOWN";
         if(diskSpaceStatus == "UP" && kafkaStatus == "UP"){
             resultStatus = "UP";
+            healthcheck:HealthCheckResp healthCheckResp = {status: resultStatus, details: {details}};
+            http:Ok res = {body: healthCheckResp};
+            return res;
         }
 
         //main object
         healthcheck:HealthCheckResp healthCheckResp = {status: resultStatus, details: {details}};
-        return healthCheckResp;
+        http:ServiceUnavailable res = {body: healthCheckResp};
+        return res;
     }
 };
 

diff --git a/hub/hub_service.bal b/hub/hub_service.bal
@@ -26,7 +26,7 @@ import ballerina/jballerina.java;
 
 http:Service healthCheckService = service object {
 
-    resource function get .() returns healthcheck:HealthCheckResp {
+    resource function get .() returns http:Ok|http:ServiceUnavailable{
         //diskspace
         string diskSpaceStatus = "DOWN";
         handle handleStr = java:fromString(config:CURRENT_WORKING_DIR);
@@ -60,10 +60,13 @@ http:Service healthCheckService = service object {
         string resultStatus = "DOWN";
         if(diskSpaceStatus == "UP" && consolidatorStatus == "UP"){
             resultStatus = "UP";
+            healthcheck:HealthCheckResp healthCheckResp = {status: resultStatus, details: {details}};
+             http:Ok res = {body: healthCheckResp};
+             return res;
         }
-        //main object
         healthcheck:HealthCheckResp healthCheckResp = {status: resultStatus, details: {details}};
-        return healthCheckResp;
+        http:ServiceUnavailable res = {body: healthCheckResp};
+        return res;
     }
 };