From 1e26703684f9e8022ebaa8021472c59d891b8526 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 13 Jul 2013 19:37:57 -0700 Subject: [PATCH] Report where the ledger publication stream is in server_info --- src/cpp/ripple/NetworkOPs.cpp | 8 +++++++- src/cpp/ripple/NetworkOPs.h | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp index 30910e4396..13694d7180 100644 --- a/src/cpp/ripple/NetworkOPs.cpp +++ b/src/cpp/ripple/NetworkOPs.cpp @@ -1509,6 +1509,12 @@ Json::Value NetworkOPs::getServerInfo (bool human, bool admin) info["validated_ledger"] = l; else info["closed_ledger"] = l; + + Ledger::pointer lpPublished = getPublishedLedger (); + if (!lpPublished) + info["published_ledger"] = "none"; + else if (lpPublished->getLedgerSeq() != lpClosed->getLedgerSeq()) + info["published_ledger"] = lpPublished->getLedgerSeq(); } return info; @@ -2375,7 +2381,7 @@ void NetworkOPs::doClusterReport () node.set_reporttime(it->second.getReportTime()); node.set_nodeload(it->second.getLoadFee()); if (!it->second.getName().empty()) - node.set_nodename(it->second.getName()); + node.set_nodename(it->second.getName()); } PackedMessage::pointer message = boost::make_shared(cluster, protocol::mtCLUSTER); diff --git a/src/cpp/ripple/NetworkOPs.h b/src/cpp/ripple/NetworkOPs.h index 0bb74cf30a..d2797f7471 100644 --- a/src/cpp/ripple/NetworkOPs.h +++ b/src/cpp/ripple/NetworkOPs.h @@ -80,6 +80,10 @@ public: { return mLedgerMaster->getValidatedLedger (); } + Ledger::ref getPublishedLedger () + { + return mLedgerMaster->getPublishedLedger (); + } Ledger::ref getCurrentLedger () { return mLedgerMaster->getCurrentLedger ();