Fix for service status response (#39)

assertis · Sep 27, 2018 · fb8d852 · fb8d852
1 parent 88abc47
commit fb8d852
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Jsend/ServiceStatusResponse.php b/src/Jsend/ServiceStatusResponse.php
@@ -117,20 +117,22 @@ public static function checkServices(
         $servicesStatus = [];
         foreach ($servicesClients as $serviceName => $serviceClient) {
             $serviceName = $serviceClient->getName();
-
             if (!empty($servicesStatus[$serviceName]) ||
                 in_array($serviceName, $whoAsks)) {
-                $servicesStatus[$serviceName] = StatusEnum::SUCCESS;
+                $servicesStatus[$serviceName] = !empty($serviceStatus[$serviceName]) ? $serviceStatus[$serviceName] : StatusEnum::SUCCESS;
                 continue;
             }
             $serviceStatusResult = ServiceStatusResponse::getServiceStatus($serviceClient, $whoAsks, $headers);
             $data = $serviceStatusResult->getResponseBody();
-            if ($data['status'] !== StatusEnum::SUCCESS) {
+            if($data['status'] !== StatusEnum::SUCCESS) {
                 $status = StatusEnum::ERROR;
             }
             $servicesStatus[$serviceName] = $data['status'];
-            foreach ($data['data']['services'] as $key => $status) {
-                $servicesStatus[$key] = $status;
+            foreach ($data['data']['services'] as $key => $serviceStatus) {
+                $servicesStatus[$key] = $serviceStatus;
+                if($serviceStatus !== StatusEnum::SUCCESS) {
+                    $status = StatusEnum::ERROR;
+                }
             }
         }
         return $servicesStatus;