ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-21 19:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have RPCSub use new callRPC.

Browse Source
This commit is contained in:
Arthur Britto
2013-02-01 19:25:01 -08:00
parent c25f480cb8
commit 1b9bf68877
5 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/cpp/ripple/CallRPC.cpp
View File

@@ -701,31 +701,36 @@ bool responseRPC(
boost::function<void(const Json::Value& jvInput)> callbackFuncP,
const boost::system::error_code& ecResult, int iStatus, const std::string& strData)
{
// Receive reply
if (iStatus == 401)
throw std::runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
else if ((iStatus >= 400) && (iStatus != 400) && (iStatus != 404) && (iStatus != 500)) // ?
throw std::runtime_error(strprintf("server returned HTTP error %d", iStatus));
else if (strData.empty())
throw std::runtime_error("no response from server");
if (callbackFuncP)
{
// Only care about the result, if we care to deliver it callbackFuncP.
// Parse reply
cLog(lsDEBUG) << "RPC reply: " << strData << std::endl;
// Receive reply
if (iStatus == 401)
throw std::runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
else if ((iStatus >= 400) && (iStatus != 400) && (iStatus != 404) && (iStatus != 500)) // ?
throw std::runtime_error(strprintf("server returned HTTP error %d", iStatus));
else if (strData.empty())
throw std::runtime_error("no response from server");
Json::Reader reader;
Json::Value jvReply;
// Parse reply
cLog(lsDEBUG) << "RPC reply: " << strData << std::endl;
if (!reader.parse(strData, jvReply))
throw std::runtime_error("couldn't parse reply from server");
Json::Reader reader;
Json::Value jvReply;
if (jvReply.isNull())
throw std::runtime_error("expected reply to have result, error and id properties");
if (!reader.parse(strData, jvReply))
throw std::runtime_error("couldn't parse reply from server");
Json::Value jvResult(Json::objectValue);
if (jvReply.isNull())
throw std::runtime_error("expected reply to have result, error and id properties");
jvResult["result"] = jvReply;
Json::Value jvResult(Json::objectValue);
(callbackFuncP)(jvResult);
jvResult["result"] = jvReply;
(callbackFuncP)(jvResult);
}
return false;
}