ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix network state reporting in server and client.

Browse Source
This commit is contained in:
Arthur Britto
2012-12-14 16:34:11 -08:00
parent 5b60c73489
commit f93dc7a7b4
4 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2101,21 +2101,24 @@ 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")
jvResult["server_status"] = mNetOps->strOperatingMode();
} else if(streamName=="ledger")
{
mNetOps->subLedger(mInfoSub, jvResult);
}else if(streamName=="transactions")
} else if(streamName=="transactions")
{
mNetOps->subTransactions(mInfoSub);
}else if(streamName=="rt_transactions")
} else if(streamName=="rt_transactions")
{
mNetOps->subRTTransactions(mInfoSub);
}else
{
}
else {
jvResult["error"] = str(boost::format("Unknown stream: %s") % streamName);
}
}else
} else
{
jvResult["error"] = "malformedSteam";
}
@@ -2362,7 +2365,9 @@ Json::Value RPCHandler::doCommand(Json::Value& jvRequest, int iRole)
{
return rpcError(rpcNO_EVENTS);
}
else if ((commandsA[i].iOptions & optNetwork) && !mNetOps->available())
else if (commandsA[i].iOptions & optNetwork
&& mNetOps->getOperatingMode() != NetworkOPs::omTRACKING
&& mNetOps->getOperatingMode() != NetworkOPs::omFULL)
{
return rpcError(rpcNO_NETWORK);
}