mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-22 14:50:54 +00:00
Merge branch 'pratik/otel-phase8-log-correlation' into pratik/otel-phase9-metric-gap-fill
Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
This commit is contained in:
@@ -332,7 +332,7 @@ public:
|
||||
[this] { signalStop("PerfLog"); }))
|
||||
, telemetry_(
|
||||
telemetry::makeTelemetry(
|
||||
telemetry::setupTelemetry(
|
||||
telemetry::makeTelemetrySetup(
|
||||
config_->section("telemetry"),
|
||||
"", // Updated later via setServiceInstanceId()
|
||||
BuildInfo::getVersionString(),
|
||||
@@ -1697,7 +1697,9 @@ ApplicationImp::signalStop(std::string const& msg)
|
||||
JLOG(journal_.warn()) << "Server stopping";
|
||||
}
|
||||
else
|
||||
{
|
||||
JLOG(journal_.warn()) << "Server stopping: " << msg;
|
||||
}
|
||||
|
||||
isTimeToStop.notify_all();
|
||||
}
|
||||
@@ -1764,7 +1766,7 @@ ApplicationImp::startGenesisLedger()
|
||||
auto const next = std::make_shared<Ledger>(*genesis, getTimeKeeper().closeTime());
|
||||
next->updateSkipList();
|
||||
XRPL_ASSERT(
|
||||
next->header().seq < kXrpLedgerEarliestFees || next->read(keylet::fees()),
|
||||
next->header().seq < kXrpLedgerEarliestFees || next->read(keylet::feeSettings()),
|
||||
"xrpl::ApplicationImp::startGenesisLedger : valid ledger fees");
|
||||
next->setImmutable();
|
||||
openLedger_.emplace(next, cachedSLEs_, logs_->journal("OpenLedger"));
|
||||
@@ -1786,7 +1788,7 @@ ApplicationImp::getLastFullLedger()
|
||||
return ledger;
|
||||
|
||||
XRPL_ASSERT(
|
||||
ledger->header().seq < kXrpLedgerEarliestFees || ledger->read(keylet::fees()),
|
||||
ledger->header().seq < kXrpLedgerEarliestFees || ledger->read(keylet::feeSettings()),
|
||||
"xrpl::ApplicationImp::getLastFullLedger : valid ledger fees");
|
||||
ledger->setImmutable();
|
||||
|
||||
@@ -1937,7 +1939,8 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
|
||||
loadLedger->stateMap().flushDirty(NodeObjectType::AccountNode);
|
||||
|
||||
XRPL_ASSERT(
|
||||
loadLedger->header().seq < kXrpLedgerEarliestFees || loadLedger->read(keylet::fees()),
|
||||
loadLedger->header().seq < kXrpLedgerEarliestFees ||
|
||||
loadLedger->read(keylet::feeSettings()),
|
||||
"xrpl::ApplicationImp::loadLedgerFromFile : valid ledger fees");
|
||||
loadLedger->setAccepted(closeTime, closeTimeResolution, !closeTimeEstimated);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user