diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2020-04-04 18:02:27 +0300 |
|---|---|---|
| committer | Larry Ruane <larryruane@gmail.com> | 2020-07-12 13:31:16 -0600 |
| commit | b5a80fa7e487c37b7ac0e3874a2fabade41b9ca8 (patch) | |
| tree | 8f971e7b80f55604486b99bd203a648adeb2ea27 | |
| parent | 4db44acf2d5d3b40943c94b3960f42838255b7ad (diff) | |
util: Handle HTTP_SERVICE_UNAVAILABLE in bitcoin-cli
| -rw-r--r-- | src/bitcoin-cli.cpp | 2 | ||||
| -rw-r--r-- | src/httpserver.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 9afcda4578..89f78d3678 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -429,6 +429,8 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co } else { 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) throw std::runtime_error(strprintf("server returned HTTP error %d", response.status)); else if (response.body.empty()) diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 1e5ea2de83..2a5ce18893 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -269,7 +269,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg) item.release(); /* if true, queue took ownership */ else { 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 { hreq->WriteReply(HTTP_NOT_FOUND); |