Add logging for exceptions (#3213)

XRPLF · Mar 29, 2023 · 8e1d824 · 8e1d824
1 parent 46167d1
commit 8e1d824
Show file tree

Hide file tree

Showing 17 changed files with 99 additions and 52 deletions.
diff --git a/src/ripple/app/consensus/RCLConsensus.cpp b/src/ripple/app/consensus/RCLConsensus.cpp
@@ -498,10 +498,11 @@ RCLConsensus::Adaptor::doAccept(
                 std::make_shared<STTx const>(SerialIter{item.slice()}));
             JLOG(j_.debug()) << "    Tx: " << item.key();
         }
-        catch (std::exception const&)
+        catch (std::exception const& ex)
         {
             failed.insert(item.key());
-            JLOG(j_.warn()) << "    Tx: " << item.key() << " throws!";
+            JLOG(j_.warn())
+                << "    Tx: " << item.key() << " throws: " << ex.what();
         }
     }
 
@@ -615,10 +616,11 @@ RCLConsensus::Adaptor::doAccept(
 
                     anyDisputes = true;
                 }
-                catch (std::exception const&)
+                catch (std::exception const& ex)
                 {
-                    JLOG(j_.debug())
-                        << "Failed to apply transaction we voted NO on";
+                    JLOG(j_.debug()) << "Failed to apply transaction we voted "
+                                        "NO on. Exception: "
+                                     << ex.what();
                 }
             }
         }

diff --git a/src/ripple/app/ledger/ConsensusTransSetSF.cpp b/src/ripple/app/ledger/ConsensusTransSetSF.cpp
@@ -66,9 +66,11 @@ ConsensusTransSetSF::gotNode(
                 pap->getOPs().submitTransaction(stx);
             });
         }
-        catch (std::exception const&)
+        catch (std::exception const& ex)
         {
-            JLOG(j_.warn()) << "Fetched invalid transaction in proposed set";
+            JLOG(j_.warn())
+                << "Fetched invalid transaction in proposed set. Exception: "
+                << ex.what();
         }
     }
 }

diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp
@@ -186,6 +186,7 @@ Ledger::Ledger(
     , txMap_(std::make_shared<SHAMap>(SHAMapType::TRANSACTION, family))
     , stateMap_(std::make_shared<SHAMap>(SHAMapType::STATE, family))
     , rules_{config.features}
+    , j_(beast::Journal(beast::Journal::getNullSink()))
 {
     info_.seq = 1;
     info_.drops = INITIAL_XRP;
@@ -255,6 +256,7 @@ Ledger::Ledger(
           std::make_shared<SHAMap>(SHAMapType::STATE, info.accountHash, family))
     , rules_(config.features)
     , info_(info)
+    , j_(j)
 {
     loaded = true;
 
@@ -306,6 +308,7 @@ Ledger::Ledger(Ledger const& prevLedger, NetClock::time_point closeTime)
     , stateMap_(prevLedger.stateMap_->snapShot(true))
     , fees_(prevLedger.fees_)
     , rules_(prevLedger.rules_)
+    , j_(beast::Journal(beast::Journal::getNullSink()))
 {
     info_.seq = prevLedger.info_.seq + 1;
     info_.parentCloseTime = prevLedger.info_.closeTime;
@@ -339,6 +342,7 @@ Ledger::Ledger(LedgerInfo const& info, Config const& config, Family& family)
           std::make_shared<SHAMap>(SHAMapType::STATE, info.accountHash, family))
     , rules_{config.features}
     , info_(info)
+    , j_(beast::Journal(beast::Journal::getNullSink()))
 {
     info_.hash = calculateLedgerHash(info_);
 }
@@ -352,6 +356,7 @@ Ledger::Ledger(
     , txMap_(std::make_shared<SHAMap>(SHAMapType::TRANSACTION, family))
     , stateMap_(std::make_shared<SHAMap>(SHAMapType::STATE, family))
     , rules_{config.features}
+    , j_(beast::Journal(beast::Journal::getNullSink()))
 {
     info_.seq = ledgerSeq;
     info_.closeTime = closeTime;
@@ -626,8 +631,9 @@ Ledger::setup()
     {
         ret = false;
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
+        JLOG(j_.error()) << "Exception in " << __func__ << ": " << ex.what();
         Rethrow();
     }
 
@@ -682,8 +688,9 @@ Ledger::setup()
     {
         ret = false;
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
+        JLOG(j_.error()) << "Exception in " << __func__ << ": " << ex.what();
         Rethrow();
     }
 

diff --git a/src/ripple/app/ledger/Ledger.h b/src/ripple/app/ledger/Ledger.h
@@ -410,6 +410,7 @@ class Ledger final : public std::enable_shared_from_this<Ledger>,
     Fees fees_;
     Rules rules_;
     LedgerInfo info_;
+    beast::Journal j_;
 };
 
 /** A ledger wrapped in a CachedView. */

diff --git a/src/ripple/app/ledger/impl/BuildLedger.cpp b/src/ripple/app/ledger/impl/BuildLedger.cpp
@@ -143,9 +143,10 @@ applyTransactions(
                         ++it;
                 }
             }
-            catch (std::exception const&)
+            catch (std::exception const& ex)
             {
-                JLOG(j.warn()) << "Transaction " << txid << " throws";
+                JLOG(j.warn())
+                    << "Transaction " << txid << " throws: " << ex.what();
                 failed.insert(txid);
                 it = txns.erase(it);
             }

diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/ripple/app/ledger/impl/LedgerMaster.cpp
@@ -866,10 +866,11 @@ LedgerMaster::fixMismatch(ReadView const& ledger)
             {
                 hash = hashOfSeq(ledger, lSeq, m_journal);
             }
-            catch (std::exception const&)
+            catch (std::exception const& ex)
             {
                 JLOG(m_journal.warn())
-                    << "fixMismatch encounters partial ledger";
+                    << "fixMismatch encounters partial ledger. Exception: "
+                    << ex.what();
                 clearLedger(lSeq);
                 return;
             }
@@ -1407,10 +1408,11 @@ LedgerMaster::findNewLedgersToPublish(
         JLOG(m_journal.trace())
             << "ready to publish " << ret.size() << " ledgers.";
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
         JLOG(m_journal.error())
-            << "Exception while trying to find ledgers to publish.";
+            << "Exception while trying to find ledgers to publish: "
+            << ex.what();
     }
 
     if (app_.config().LEDGER_REPLAY)
@@ -2009,9 +2011,10 @@ LedgerMaster::fetchForHistory(
                     }
                 }
             }
-            catch (std::exception const&)
+            catch (std::exception const& ex)
             {
-                JLOG(m_journal.warn()) << "Threw while prefetching";
+                JLOG(m_journal.warn())
+                    << "Threw while prefetching: " << ex.what();
             }
         }
     }
@@ -2346,9 +2349,10 @@ LedgerMaster::makeFetchPack(
 
         peer->send(msg);
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
-        JLOG(m_journal.warn()) << "Exception building fetch pach";
+        JLOG(m_journal.warn())
+            << "Exception building fetch pach. Exception: " << ex.what();
     }
 }
 

diff --git a/src/ripple/app/ledger/impl/LedgerToJson.cpp b/src/ripple/app/ledger/impl/LedgerToJson.cpp
@@ -192,9 +192,14 @@ fillJsonTx(Object& json, LedgerFill const& fill)
             appendAll(fill.ledger.txs);
         }
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
         // Nothing the user can do about this.
+        if (fill.context)
+        {
+            JLOG(fill.context->j.error())
+                << "Exception in " << __func__ << ": " << ex.what();
+        }
     }
 }
 

diff --git a/src/ripple/app/ledger/impl/OpenLedger.cpp b/src/ripple/app/ledger/impl/OpenLedger.cpp
@@ -206,9 +206,9 @@ debugTostr(SHAMap const& set)
             auto const tx = std::make_shared<STTx const>(sit);
             ss << debugTxstr(tx) << ", ";
         }
-        catch (std::exception const&)
+        catch (std::exception const& ex)
         {
-            ss << "THRO, ";
+            ss << "THROW:" << ex.what() << ", ";
         }
     }
     return ss.str();

diff --git a/src/ripple/app/misc/Manifest.h b/src/ripple/app/misc/Manifest.h
@@ -138,22 +138,26 @@ to_string(Manifest const& m);
 */
 /** @{ */
 std::optional<Manifest>
-deserializeManifest(Slice s);
+deserializeManifest(Slice s, beast::Journal journal);
 
 inline std::optional<Manifest>
-deserializeManifest(std::string const& s)
+deserializeManifest(
+    std::string const& s,
+    beast::Journal journal = beast::Journal(beast::Journal::getNullSink()))
 {
-    return deserializeManifest(makeSlice(s));
+    return deserializeManifest(makeSlice(s), journal);
 }
 
 template <
     class T,
     class = std::enable_if_t<
         std::is_same<T, char>::value || std::is_same<T, unsigned char>::value>>
 std::optional<Manifest>
-deserializeManifest(std::vector<T> const& v)
+deserializeManifest(
+    std::vector<T> const& v,
+    beast::Journal journal = beast::Journal(beast::Journal::getNullSink()))
 {
-    return deserializeManifest(makeSlice(v));
+    return deserializeManifest(makeSlice(v), journal);
 }
 /** @} */
 
@@ -180,7 +184,9 @@ struct ValidatorToken
 };
 
 std::optional<ValidatorToken>
-loadValidatorToken(std::vector<std::string> const& blob);
+loadValidatorToken(
+    std::vector<std::string> const& blob,
+    beast::Journal journal = beast::Journal(beast::Journal::getNullSink()));
 
 enum class ManifestDisposition {
     /// Manifest is valid

diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
@@ -1162,9 +1162,10 @@ NetworkOPsImp::submitTransaction(std::shared_ptr<STTx const> const& iTrans)
             return;
         }
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
-        JLOG(m_journal.warn()) << "Exception checking transaction" << txid;
+        JLOG(m_journal.warn())
+            << "Exception checking transaction " << txid << ": " << ex.what();
 
         return;
     }

diff --git a/src/ripple/app/misc/impl/Manifest.cpp b/src/ripple/app/misc/impl/Manifest.cpp
@@ -50,7 +50,7 @@ to_string(Manifest const& m)
 }
 
 std::optional<Manifest>
-deserializeManifest(Slice s)
+deserializeManifest(Slice s, beast::Journal journal)
 {
     if (s.empty())
         return std::nullopt;
@@ -148,8 +148,10 @@ deserializeManifest(Slice s)
 
         return m;
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
+        JLOG(journal.error())
+            << "Exception in " << __func__ << ": " << ex.what();
         return std::nullopt;
     }
 }
@@ -239,7 +241,7 @@ Manifest::getMasterSignature() const
 }
 
 std::optional<ValidatorToken>
-loadValidatorToken(std::vector<std::string> const& blob)
+loadValidatorToken(std::vector<std::string> const& blob, beast::Journal journal)
 {
     try
     {
@@ -277,8 +279,10 @@ loadValidatorToken(std::vector<std::string> const& blob)
 
         return std::nullopt;
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
+        JLOG(journal.error())
+            << "Exception in " << __func__ << ": " << ex.what();
         return std::nullopt;
     }
 }

diff --git a/src/ripple/app/misc/impl/ValidatorSite.cpp b/src/ripple/app/misc/impl/ValidatorSite.cpp
@@ -357,8 +357,9 @@ ValidatorSite::onTimer(std::size_t siteIdx, error_code const& ec)
         // the WorkSSL client ctor can throw if SSL init fails
         makeRequest(sites_[siteIdx].startingResource, siteIdx, lock);
     }
-    catch (std::exception&)
+    catch (std::exception const& ex)
     {
+        JLOG(j_.error()) << "Exception in " << __func__ << ": " << ex.what();
         onSiteFetch(
             boost::system::error_code{-1, boost::system::generic_category()},
             {},
@@ -526,7 +527,7 @@ ValidatorSite::processRedirect(
             throw std::runtime_error(
                 "invalid scheme in redirect " + newLocation->pUrl.scheme);
     }
-    catch (std::exception&)
+    catch (std::exception const& ex)
     {
         JLOG(j_.error()) << "Invalid redirect location: "
                          << res[field::location];
@@ -606,8 +607,10 @@ ValidatorSite::onSiteFetch(
                     }
                 }
             }
-            catch (std::exception& ex)
+            catch (std::exception const& ex)
             {
+                JLOG(j_.error())
+                    << "Exception in " << __func__ << ": " << ex.what();
                 onError(ex.what(), false);
             }
         }
@@ -643,8 +646,10 @@ ValidatorSite::onTextFetch(
 
             parseJsonResponse(res, siteIdx, lock_sites);
         }
-        catch (std::exception& ex)
+        catch (std::exception const& ex)
         {
+            JLOG(j_.error())
+                << "Exception in " << __func__ << ": " << ex.what();
             sites_[siteIdx].lastRefreshStatus.emplace(Site::Status{
                 clock_type::now(), ListDisposition::invalid, ex.what()});
         }

diff --git a/src/ripple/app/tx/impl/apply.cpp b/src/ripple/app/tx/impl/apply.cpp
@@ -159,9 +159,9 @@ applyTransaction(
         JLOG(j.debug()) << "Transaction retry: " << transHuman(result.first);
         return ApplyResult::Retry;
     }
-    catch (std::exception const&)
+    catch (std::exception const& ex)
     {
-        JLOG(j.warn()) << "Throws";
+        JLOG(j.warn()) << "Throws: " << ex.what();
         return ApplyResult::Fail;
     }
 }

diff --git a/src/ripple/basics/impl/make_SSLContext.cpp b/src/ripple/basics/impl/make_SSLContext.cpp
@@ -292,10 +292,13 @@ initAuthenticated(
 
             fclose(f);
         }
-        catch (std::exception const&)
+        catch (std::exception const& ex)
         {
             fclose(f);
-            LogicError("Reading the SSL chain file generated an exception.");
+            LogicError(
+                std::string(
+                    "Reading the SSL chain file generated an exception: ") +
+                ex.what());
         }
     }