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

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2012-12-06 20:16:19 -08:00
parent 56e85db815 670763d321
commit 8ad9d62641
23 changed files with 319 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/cpp/ripple/RPCHandler.cpp
View File

@@ -664,24 +664,16 @@ Json::Value RPCHandler::doRandom(Json::Value jvRequest)
{
uint256 uRandom;
switch (RAND_bytes(uRandom.begin(), uRandom.size()))
try
{
case 0:
case 1:
{
Json::Value jvResult;
jvResult["random"] = uRandom.ToString();
return jvResult;
}
break;
case -1:
return rpcError(rpcNOT_SUPPORTED);
default:
return rpcError(rpcINTERNAL);
getRand(uRandom.begin(), uRandom.size());
Json::Value jvResult;
jvResult["random"] = uRandom.ToString();
return jvResult;
}
catch (...)
{
return rpcError(rpcINTERNAL);
}
}
@@ -1572,7 +1564,7 @@ Json::Value RPCHandler::doLogLevel(Json::Value jvRequest)
if (!jvRequest.isMember("partition"))
{ // set base log severity
Log::setMinSeverity(sv, true);
return rpcError(rpcSUCCESS);
return Json::objectValue;
}
// log_level partition severity base?
@@ -1584,7 +1576,7 @@ Json::Value RPCHandler::doLogLevel(Json::Value jvRequest)
else if (!LogPartition::setSeverity(partition, sv))
return rpcError(rpcINVALID_PARAMS);
return rpcError(rpcSUCCESS);
return Json::objectValue;
}
return rpcError(rpcINVALID_PARAMS);
@@ -2092,6 +2084,7 @@ Json::Value RPCHandler::doSubscribe(Json::Value jvRequest)
if(streamName=="server")
{
mNetOps->subServer(mInfoSub, jvResult);
jvResult["server_status"] = mNetOps->available() ? "ok" : "noNetwork";
}else if(streamName=="ledger")
{
mNetOps->subLedger(mInfoSub, jvResult);