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

Clean up JSON reporting of booleans and network state.

Browse Source
This commit is contained in:
JoelKatz
2013-01-18 17:38:11 -08:00
parent 032022a5bf
commit 80d98e55a9
5 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -33,9 +33,9 @@ void InfoSub::onSendEmpty()
}
NetworkOPs::NetworkOPs(boost::asio::io_service& io_service, LedgerMaster* pLedgerMaster) :
mMode(omDISCONNECTED), mNeedNetworkLedger(false), mNetTimer(io_service), mLedgerMaster(pLedgerMaster),
mCloseTimeOffset(0), mLastCloseProposers(0), mLastCloseConvergeTime(1000 * LEDGER_IDLE_INTERVAL),
mLastValidationTime(0)
mMode(omDISCONNECTED), mNeedNetworkLedger(false), mProposing(false), mValidating(false),
mNetTimer(io_service), mLedgerMaster(pLedgerMaster), mCloseTimeOffset(0), mLastCloseProposers(0),
mLastCloseConvergeTime(1000 * LEDGER_IDLE_INTERVAL), mLastValidationTime(0)
{
}
@@ -48,6 +48,14 @@ std::string NetworkOPs::strOperatingMode()
"full"
};
if (mMode == omFULL)
{
if (mProposing)
return "proposing";
if (mValidating)
return "validating";
}
return paStatusToken[mMode];
}
@@ -1100,14 +1108,8 @@ Json::Value NetworkOPs::getServerInfo(bool human, bool admin)
if (theConfig.TESTNET)
info["testnet"] = theConfig.TESTNET;
switch (mMode)
{
case omDISCONNECTED: info["server_state"] = "disconnected"; break;
case omCONNECTED: info["server_state"] = "connected"; break;
case omTRACKING: info["server_state"] = "tracking"; break;
case omFULL: info["server_state"] = "validating"; break;
default: info["server_state"] = "unknown";
}
info["server_state"] = strOperatingMode();
if (mNeedNetworkLedger)
info["network_ledger"] = "waiting";