Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up health check API response #2779

Merged
merged 2 commits into from
Jan 13, 2024
Merged

Clean up health check API response #2779

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbae348
Clean up logs formatting
sieniven Jan 13, 2024
1548d52
Better response
sieniven Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/rest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ static bool rest_blockchain_readiness(HTTPRequest* req, const std::string&) {

if (status["health_status"].get_bool()) {
req->WriteHeader("Content-Type", "text/plain");
req->WriteReply(HTTP_OK, "Health status: Ready - sync-to-tip: true, active-peers: true.");
req->WriteReply(HTTP_OK, "Health status: Ready - sync-to-tip: true, active-peers: true.\n");
return true;
} else {
std::string syncToTip = "false";
Expand All @@ -656,17 +656,17 @@ static bool rest_blockchain_readiness(HTTPRequest* req, const std::string&) {
if (status["active_peer_nodes"].get_bool()) {
activePeerNodes = "true";
}
RESTERR(req, HTTP_SERVICE_UNAVAILABLE, strprintf("Health status: Not ready - sync-to-tip: %s, active-peers: %s.", syncToTip, activePeerNodes));
RESTERR(req, HTTP_SERVICE_UNAVAILABLE, strprintf("Health status: Not ready - sync-to-tip: %s, active-peers: %s.\n", syncToTip, activePeerNodes));
return false;
}
} catch (const UniValue& objError) {
HTTPStatusCode nStatus = HTTP_INTERNAL_SERVER_ERROR;
std::string msg = "";
int code = find_value(objError, "code").get_int();

if (code == RPC_CLIENT_P2P_DISABLED)
if (code == RPC_CLIENT_P2P_DISABLED) {
nStatus = HTTP_SERVICE_UNAVAILABLE;
msg = "Error: Peer-to-peer functionality missing or disabled";
msg = "Health status: Not ready - peer-to-peer functionality missing or disabled.\n";
}
RESTERR(req, nStatus, msg);
return false;
} catch (const std::exception& e) {
Expand Down
Loading