Merge pull request #2478 from sisuresh/catchupLogBug

Fix catchup log message when catching up to current Reviewed-by: MonsieurNicolas
stellar · Mar 31, 2020 · f25cabe · f25cabe
2 parents 22fc91c + 9706415
commit f25cabe
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/catchup/CatchupWork.cpp b/src/catchup/CatchupWork.cpp
@@ -53,9 +53,25 @@ CatchupWork::~CatchupWork()
 std::string
 CatchupWork::getStatus() const
 {
-    return fmt::format(
-        "Catching up to ledger {}: {}", mCatchupConfiguration.toLedger(),
-        mCurrentWork ? mCurrentWork->getStatus() : Work::getStatus());
+    std::string toLedger;
+    if (mCatchupConfiguration.toLedger() == CatchupConfiguration::CURRENT)
+    {
+        toLedger = mGetHistoryArchiveStateWork &&
+                           mGetHistoryArchiveStateWork->getState() ==
+                               State::WORK_SUCCESS
+                       ? std::to_string(mGetHistoryArchiveStateWork
+                                            ->getHistoryArchiveState()
+                                            .currentLedger)
+                       : "CURRENT";
+    }
+    else
+    {
+        toLedger = std::to_string(mCatchupConfiguration.toLedger());
+    }
+
+    return fmt::format("Catching up to ledger {}: {}", toLedger,
+                       mCurrentWork ? mCurrentWork->getStatus()
+                                    : Work::getStatus());
 }
 
 void