Split into server_info (for humans) and server_state (for machines).

Allow either without admin privileges, filter information out from non-admins.
Cleanup and improve data in all cases.
This commit is contained in:
JoelKatz
2013-01-15 19:16:20 -08:00
parent 01b3e9e0ae
commit 8191153dce
5 changed files with 59 additions and 17 deletions

View File

@@ -141,6 +141,7 @@ public:
std::string strOperatingMode();
Ledger::ref getClosedLedger() { return mLedgerMaster->getClosedLedger(); }
Ledger::ref getValidatedLedger() { return mLedgerMaster->getValidatedLedger(); }
Ledger::ref getCurrentLedger() { return mLedgerMaster->getCurrentLedger(); }
Ledger::pointer getLedgerByHash(const uint256& hash) { return mLedgerMaster->getLedgerByHash(hash); }
Ledger::pointer getLedgerBySeq(const uint32 seq) { return mLedgerMaster->getLedgerBySeq(seq); }
@@ -243,7 +244,7 @@ public:
int getPreviousConvergeTime() { return mLastCloseConvergeTime; }
uint32 getLastCloseTime() { return mLastCloseTime; }
void setLastCloseTime(uint32 t) { mLastCloseTime = t; }
Json::Value getServerInfo(bool admin);
Json::Value getServerInfo(bool human, bool admin);
uint32 acceptLedger();
boost::unordered_map<uint160,
std::list<LedgerProposal::pointer> >& peekStoredProposals() { return mStoredProposals; }