highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-15 11:21:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

util: Handle HTTP_SERVICE_UNAVAILABLE in bitcoin-cli

Browse Source
This commit is contained in:
Hennadii Stepanov 2020-04-04 18:02:27 +03:00 committed by Larry Ruane
parent 4db44acf2d
commit b5a80fa7e4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitcoin-cli.cpp
View File

@ -429,6 +429,8 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co
} else { } else {
throw std::runtime_error("Authorization failed: Incorrect rpcuser or rpcpassword"); throw std::runtime_error("Authorization failed: Incorrect rpcuser or rpcpassword");
} }
} else if (response.status == HTTP_SERVICE_UNAVAILABLE) {
throw std::runtime_error(strprintf("Server response: %s", response.body));
} else if (response.status >= 400 && response.status != HTTP_BAD_REQUEST && response.status != HTTP_NOT_FOUND && response.status != HTTP_INTERNAL_SERVER_ERROR) } else if (response.status >= 400 && response.status != HTTP_BAD_REQUEST && response.status != HTTP_NOT_FOUND && response.status != HTTP_INTERNAL_SERVER_ERROR)
throw std::runtime_error(strprintf("server returned HTTP error %d", response.status)); throw std::runtime_error(strprintf("server returned HTTP error %d", response.status));
else if (response.body.empty()) else if (response.body.empty())

2
src/httpserver.cpp
View File

@ -269,7 +269,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
item.release(); /* if true, queue took ownership */ item.release(); /* if true, queue took ownership */
else { else {
LogPrintf("WARNING: request rejected because http work queue depth exceeded, it can be increased with the -rpcworkqueue= setting\n"); LogPrintf("WARNING: request rejected because http work queue depth exceeded, it can be increased with the -rpcworkqueue= setting\n");
item->req->WriteReply(HTTP_INTERNAL_SERVER_ERROR, "Work queue depth exceeded"); item->req->WriteReply(HTTP_SERVICE_UNAVAILABLE, "Work queue depth exceeded");
} }
} else { } else {
hreq->WriteReply(HTTP_NOT_FOUND); hreq->WriteReply(HTTP_NOT_FOUND);