mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-02 08:55:53 +00:00
Make debugLog() return a beast::Journal (RIPD-1209):
Previously, writes using debugLog() tagged every entry with "TRC:". Now users of debugLog() must specify the severity level they want their information logged at.
This commit is contained in:
@@ -263,7 +263,7 @@ setDebugLogSink(
|
|||||||
may never be seen. Never use it for critical
|
may never be seen. Never use it for critical
|
||||||
information.
|
information.
|
||||||
*/
|
*/
|
||||||
beast::Journal::Stream
|
beast::Journal
|
||||||
debugLog();
|
debugLog();
|
||||||
|
|
||||||
} // ripple
|
} // ripple
|
||||||
|
|||||||
@@ -403,10 +403,10 @@ setDebugLogSink(
|
|||||||
return debugSink().set(std::move(sink));
|
return debugSink().set(std::move(sink));
|
||||||
}
|
}
|
||||||
|
|
||||||
beast::Journal::Stream
|
beast::Journal
|
||||||
debugLog()
|
debugLog()
|
||||||
{
|
{
|
||||||
return { debugSink().get() };
|
return beast::Journal (debugSink().get());
|
||||||
}
|
}
|
||||||
|
|
||||||
} // ripple
|
} // ripple
|
||||||
|
|||||||
@@ -43,14 +43,14 @@ accessViolation() noexcept
|
|||||||
void
|
void
|
||||||
LogThrow (std::string const& title)
|
LogThrow (std::string const& title)
|
||||||
{
|
{
|
||||||
JLOG(debugLog()) << title;
|
JLOG(debugLog().warn()) << title;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[noreturn]]
|
[[noreturn]]
|
||||||
void
|
void
|
||||||
LogicError (std::string const& s) noexcept
|
LogicError (std::string const& s) noexcept
|
||||||
{
|
{
|
||||||
JLOG(debugLog()) << s;
|
JLOG(debugLog().fatal()) << s;
|
||||||
std::cerr << "Logic error: " << s << std::endl;
|
std::cerr << "Logic error: " << s << std::endl;
|
||||||
detail::accessViolation();
|
detail::accessViolation();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ void reportUncaughtException (
|
|||||||
if (! extra.empty())
|
if (! extra.empty())
|
||||||
ss << "; " << extra;
|
ss << "; " << extra;
|
||||||
|
|
||||||
JLOG(debugLog()) << ss.str();
|
JLOG(debugLog().fatal()) << ss.str();
|
||||||
std::cerr << ss.str() << std::endl;
|
std::cerr << ss.str() << std::endl;
|
||||||
throw;
|
throw;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ T rangeCheckedCast (C c)
|
|||||||
std::numeric_limits<C>::is_signed &&
|
std::numeric_limits<C>::is_signed &&
|
||||||
c < std::numeric_limits<T>::lowest ()))
|
c < std::numeric_limits<T>::lowest ()))
|
||||||
{
|
{
|
||||||
JLOG (debugLog()) << "rangeCheckedCast domain error:"
|
JLOG (debugLog().error()) << "rangeCheckedCast domain error:"
|
||||||
<< " value = " << c
|
<< " value = " << c
|
||||||
<< " min = " << std::numeric_limits<T>::lowest ()
|
<< " min = " << std::numeric_limits<T>::lowest ()
|
||||||
<< " max: " << std::numeric_limits<T>::max ();
|
<< " max: " << std::numeric_limits<T>::max ();
|
||||||
|
|||||||
@@ -906,7 +906,7 @@ amountFromJsonNoThrow (STAmount& result, Json::Value const& jvSource)
|
|||||||
}
|
}
|
||||||
catch (const std::exception& e)
|
catch (const std::exception& e)
|
||||||
{
|
{
|
||||||
JLOG (debugLog()) <<
|
JLOG (debugLog().warn()) <<
|
||||||
"amountFromJsonNoThrow: caught: " << e.what ();
|
"amountFromJsonNoThrow: caught: " << e.what ();
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ STArray::STArray (SerialIter& sit, SField const& f)
|
|||||||
|
|
||||||
if ((type == STI_OBJECT) && (field == 1))
|
if ((type == STI_OBJECT) && (field == 1))
|
||||||
{
|
{
|
||||||
JLOG (debugLog()) <<
|
JLOG (debugLog().error()) <<
|
||||||
"Encountered array with end of object marker";
|
"Encountered array with end of object marker";
|
||||||
Throw<std::runtime_error> ("Illegal terminator in array");
|
Throw<std::runtime_error> ("Illegal terminator in array");
|
||||||
}
|
}
|
||||||
@@ -85,14 +85,14 @@ STArray::STArray (SerialIter& sit, SField const& f)
|
|||||||
|
|
||||||
if (fn.isInvalid ())
|
if (fn.isInvalid ())
|
||||||
{
|
{
|
||||||
JLOG (debugLog()) <<
|
JLOG (debugLog().error()) <<
|
||||||
"Unknown field: " << type << "/" << field;
|
"Unknown field: " << type << "/" << field;
|
||||||
Throw<std::runtime_error> ("Unknown field");
|
Throw<std::runtime_error> ("Unknown field");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fn.fieldType != STI_OBJECT)
|
if (fn.fieldType != STI_OBJECT)
|
||||||
{
|
{
|
||||||
JLOG (debugLog()) <<
|
JLOG (debugLog().error()) <<
|
||||||
"Array contains non-object";
|
"Array contains non-object";
|
||||||
Throw<std::runtime_error> ("Non-object in array");
|
Throw<std::runtime_error> ("Non-object in array");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ STUInt8::getText () const
|
|||||||
if (transResultInfo (static_cast<TER> (value_), token, human))
|
if (transResultInfo (static_cast<TER> (value_), token, human))
|
||||||
return human;
|
return human;
|
||||||
|
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "Unknown result code in metadata: " << value_;
|
<< "Unknown result code in metadata: " << value_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,7 +70,7 @@ STUInt8::getJson (int) const
|
|||||||
if (transResultInfo (static_cast<TER> (value_), token, human))
|
if (transResultInfo (static_cast<TER> (value_), token, human))
|
||||||
return token;
|
return token;
|
||||||
|
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "Unknown result code in metadata: " << value_;
|
<< "Unknown result code in metadata: " << value_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ void STLedgerEntry::setSLEType ()
|
|||||||
type_ = mFormat->getType ();
|
type_ = mFormat->getType ();
|
||||||
if (!setType (mFormat->elements))
|
if (!setType (mFormat->elements))
|
||||||
{
|
{
|
||||||
if (auto j = debugLog())
|
if (auto j = debugLog().error())
|
||||||
{
|
{
|
||||||
j << "Ledger entry not valid for type " << mFormat->getName ();
|
j << "Ledger entry not valid for type " << mFormat->getName ();
|
||||||
j << "Object: " << getJson (0);
|
j << "Object: " << getJson (0);
|
||||||
@@ -141,7 +141,7 @@ bool STLedgerEntry::thread (uint256 const& txID, std::uint32_t ledgerSeq,
|
|||||||
{
|
{
|
||||||
uint256 oldPrevTxID = getFieldH256 (sfPreviousTxnID);
|
uint256 oldPrevTxID = getFieldH256 (sfPreviousTxnID);
|
||||||
|
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().info())
|
||||||
<< "Thread Tx:" << txID << " prev:" << oldPrevTxID;
|
<< "Thread Tx:" << txID << " prev:" << oldPrevTxID;
|
||||||
|
|
||||||
if (oldPrevTxID == txID)
|
if (oldPrevTxID == txID)
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ bool STObject::setType (const SOTemplate& type)
|
|||||||
{
|
{
|
||||||
if ((e->flags == SOE_DEFAULT) && iter->get().isDefault())
|
if ((e->flags == SOE_DEFAULT) && iter->get().isDefault())
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "setType(" << getFName().getName()
|
<< "setType(" << getFName().getName()
|
||||||
<< "): explicit default " << e->e_field.fieldName;
|
<< "): explicit default " << e->e_field.fieldName;
|
||||||
valid = false;
|
valid = false;
|
||||||
@@ -125,7 +125,7 @@ bool STObject::setType (const SOTemplate& type)
|
|||||||
{
|
{
|
||||||
if (e->flags == SOE_REQUIRED)
|
if (e->flags == SOE_REQUIRED)
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "setType(" << getFName().getName()
|
<< "setType(" << getFName().getName()
|
||||||
<< "): missing " << e->e_field.fieldName;
|
<< "): missing " << e->e_field.fieldName;
|
||||||
valid = false;
|
valid = false;
|
||||||
@@ -138,7 +138,7 @@ bool STObject::setType (const SOTemplate& type)
|
|||||||
// Anything left over in the object must be discardable
|
// Anything left over in the object must be discardable
|
||||||
if (! e->getFName().isDiscardable())
|
if (! e->getFName().isDiscardable())
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "setType(" << getFName().getName()
|
<< "setType(" << getFName().getName()
|
||||||
<< "): non-discardable leftover " << e->getFName().getName ();
|
<< "): non-discardable leftover " << e->getFName().getName ();
|
||||||
valid = false;
|
valid = false;
|
||||||
@@ -208,7 +208,7 @@ bool STObject::set (SerialIter& sit, int depth)
|
|||||||
|
|
||||||
if ((type == STI_ARRAY) && (field == 1))
|
if ((type == STI_ARRAY) && (field == 1))
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "Encountered object with end of array marker";
|
<< "Encountered object with end of array marker";
|
||||||
Throw<std::runtime_error> ("Illegal terminator in object");
|
Throw<std::runtime_error> ("Illegal terminator in object");
|
||||||
}
|
}
|
||||||
@@ -221,7 +221,7 @@ bool STObject::set (SerialIter& sit, int depth)
|
|||||||
|
|
||||||
if (fn.isInvalid ())
|
if (fn.isInvalid ())
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "Unknown field: field_type=" << type
|
<< "Unknown field: field_type=" << type
|
||||||
<< ", field_name=" << field;
|
<< ", field_name=" << field;
|
||||||
Throw<std::runtime_error> ("Unknown field");
|
Throw<std::runtime_error> ("Unknown field");
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ STPathSet::STPathSet (SerialIter& sit, SField const& name)
|
|||||||
{
|
{
|
||||||
if (path.empty ())
|
if (path.empty ())
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "Empty path in pathset";
|
<< "Empty path in pathset";
|
||||||
Throw<std::runtime_error> ("empty path");
|
Throw<std::runtime_error> ("empty path");
|
||||||
}
|
}
|
||||||
@@ -77,7 +77,7 @@ STPathSet::STPathSet (SerialIter& sit, SField const& name)
|
|||||||
}
|
}
|
||||||
else if (iType & ~STPathElement::typeAll)
|
else if (iType & ~STPathElement::typeAll)
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "Bad path element " << iType << " in pathset";
|
<< "Bad path element " << iType << " in pathset";
|
||||||
Throw<std::runtime_error> ("bad path element");
|
Throw<std::runtime_error> ("bad path element");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ STValidation::STValidation (SerialIter& sit, bool checkSignature)
|
|||||||
|
|
||||||
if (checkSignature && !isValid ())
|
if (checkSignature && !isValid ())
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "Invalid validation" << getJson (0);
|
<< "Invalid validation" << getJson (0);
|
||||||
Throw<std::runtime_error> ("Invalid validation");
|
Throw<std::runtime_error> ("Invalid validation");
|
||||||
}
|
}
|
||||||
@@ -113,7 +113,7 @@ bool STValidation::isValid (uint256 const& signingHash) const
|
|||||||
}
|
}
|
||||||
catch (std::exception const&)
|
catch (std::exception const&)
|
||||||
{
|
{
|
||||||
JLOG (debugLog())
|
JLOG (debugLog().error())
|
||||||
<< "Exception validating validation";
|
<< "Exception validating validation";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user