From d07deb8280ecb586bf9c5a9cf1de46c3fa7ce49f Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 12 Oct 2026 20:15:23 -0400 Subject: [PATCH] correct formatting; --- src/fne/restapi/RESTAPI.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/fne/restapi/RESTAPI.cpp b/src/fne/restapi/RESTAPI.cpp index 8284f5b5..1b92b442 100644 --- a/src/fne/restapi/RESTAPI.cpp +++ b/src/fne/restapi/RESTAPI.cpp @@ -2258,10 +2258,12 @@ void RESTAPI::restAPI_GetHealth(const HTTPPayload& request, HTTPPayload& reply, health["overall"].set(HEALTH_FAILED); reasonCodes.push_back(json::value(HEALTH_REASON_TRAFFIC_NETWORK_UNAVAILABLE)); reasons.push_back(json::value("traffic network is not initialized")); + health["reasonCodes"].set(reasonCodes); health["reasons"].set(reasons); response["health"].set(health); reply.payload(response); + return; } @@ -2278,8 +2280,7 @@ void RESTAPI::restAPI_GetHealth(const HTTPPayload& request, HTTPPayload& reply, const uint64_t metadataLastTick = metadataUnavailable ? 0U : mdNetwork->m_healthLastDataPlaneTick.load(std::memory_order_relaxed); const uint64_t metadataTickAge = ageMs(metadataLastTick); const bool metadataPlaneInitializing = !metadataUnavailable && metadataLastTick == 0U; - const bool metadataPlaneStalled = metadataUnavailable || - (!metadataPlaneInitializing && metadataTickAge > loopStallThreshold); + const bool metadataPlaneStalled = metadataUnavailable || (!metadataPlaneInitializing && metadataTickAge > loopStallThreshold); const bool dataPlaneInitializing = trafficPlaneInitializing || metadataPlaneInitializing; const bool dataPlaneStalled = trafficPlaneStalled || metadataPlaneStalled; @@ -2309,6 +2310,7 @@ void RESTAPI::restAPI_GetHealth(const HTTPPayload& request, HTTPPayload& reply, const uint64_t queueStallThreshold = 5000U; const bool trafficQueueStalled = inFlight > 0U && taskProgressAge > queueStallThreshold; + // construct JSON object representing the status of the traffic inbound worker queue json::object inboundQueue = json::object(); inboundQueue["submittedTotal"].set(submitted); inboundQueue["completedTotal"].set(completed); @@ -2324,10 +2326,10 @@ void RESTAPI::restAPI_GetHealth(const HTTPPayload& request, HTTPPayload& reply, const uint64_t metadataInFlight = metadataSubmitted >= metadataCompleted ? metadataSubmitted - metadataCompleted : 0U; const uint64_t metadataLastTaskProgress = metadataUnavailable ? 0U : mdNetwork->m_healthLastTaskProgress.load(std::memory_order_relaxed); const uint64_t metadataTaskProgressAge = metadataInFlight > 0U ? ageMs(metadataLastTaskProgress) : 0U; - const bool metadataQueueStalled = !metadataUnavailable && metadataInFlight > 0U && - metadataTaskProgressAge > queueStallThreshold; + const bool metadataQueueStalled = !metadataUnavailable && metadataInFlight > 0U && metadataTaskProgressAge > queueStallThreshold; const bool queueStalled = trafficQueueStalled || metadataQueueStalled; + // construct JSON object representing the status of the metadata inbound worker queue json::object metadataQueue = json::object(); metadataQueue["submittedTotal"].set(metadataSubmitted); metadataQueue["completedTotal"].set(metadataCompleted); @@ -2338,6 +2340,7 @@ void RESTAPI::restAPI_GetHealth(const HTTPPayload& request, HTTPPayload& reply, metadataQueue["enqueueFailures"].set(metadataEnqueueFailures); metadataQueue["progressing"].set(metadataQueueProgressing); + // construct JSON object representing the status of all inbound worker queues json::object queues = json::object(); queues["status"].set(queueStalled ? HEALTH_FAILED : HEALTH_HEALTHY); queues["stallThresholdMs"].set(queueStallThreshold);