[logging] Comment all continuing logs.
Most logs should terminated with a '\n'. Some logs are built up over multiple calls to logPrintf(), so do not need a newline terminater. Comment all of these 'continued' logs as a linter hing.
This commit is contained in:
parent
2b54155a45
commit
5c21e6c6d3
6 changed files with 13 additions and 13 deletions
|
@ -63,7 +63,7 @@ public:
|
||||||
|
|
||||||
assert(p <= limit);
|
assert(p <= limit);
|
||||||
base[std::min(bufsize - 1, (int)(p - base))] = '\0';
|
base[std::min(bufsize - 1, (int)(p - base))] = '\0';
|
||||||
LogPrintf("leveldb: %s", base);
|
LogPrintf("leveldb: %s", base); /* Continued */
|
||||||
if (base != buffer) {
|
if (base != buffer) {
|
||||||
delete[] base;
|
delete[] base;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1215,7 +1215,7 @@ bool AppInitMain()
|
||||||
|
|
||||||
// Warn about relative -datadir path.
|
// Warn about relative -datadir path.
|
||||||
if (gArgs.IsArgSet("-datadir") && !fs::path(gArgs.GetArg("-datadir", "")).is_absolute()) {
|
if (gArgs.IsArgSet("-datadir") && !fs::path(gArgs.GetArg("-datadir", "")).is_absolute()) {
|
||||||
LogPrintf("Warning: relative datadir option '%s' specified, which will be interpreted relative to the "
|
LogPrintf("Warning: relative datadir option '%s' specified, which will be interpreted relative to the " /* Continued */
|
||||||
"current working directory '%s'. This is fragile, because if bitcoin is started in the future "
|
"current working directory '%s'. This is fragile, because if bitcoin is started in the future "
|
||||||
"from a different location, it will be unable to locate the current data files. There could "
|
"from a different location, it will be unable to locate the current data files. There could "
|
||||||
"also be data loss if bitcoin is started while in a temporary directory.\n",
|
"also be data loss if bitcoin is started while in a temporary directory.\n",
|
||||||
|
|
|
@ -81,20 +81,20 @@ static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch,
|
||||||
LogPrintf("Previous lock order was:\n");
|
LogPrintf("Previous lock order was:\n");
|
||||||
for (const std::pair<void*, CLockLocation> & i : s2) {
|
for (const std::pair<void*, CLockLocation> & i : s2) {
|
||||||
if (i.first == mismatch.first) {
|
if (i.first == mismatch.first) {
|
||||||
LogPrintf(" (1)");
|
LogPrintf(" (1)"); /* Continued */
|
||||||
}
|
}
|
||||||
if (i.first == mismatch.second) {
|
if (i.first == mismatch.second) {
|
||||||
LogPrintf(" (2)");
|
LogPrintf(" (2)"); /* Continued */
|
||||||
}
|
}
|
||||||
LogPrintf(" %s\n", i.second.ToString());
|
LogPrintf(" %s\n", i.second.ToString());
|
||||||
}
|
}
|
||||||
LogPrintf("Current lock order is:\n");
|
LogPrintf("Current lock order is:\n");
|
||||||
for (const std::pair<void*, CLockLocation> & i : s1) {
|
for (const std::pair<void*, CLockLocation> & i : s1) {
|
||||||
if (i.first == mismatch.first) {
|
if (i.first == mismatch.first) {
|
||||||
LogPrintf(" (1)");
|
LogPrintf(" (1)"); /* Continued */
|
||||||
}
|
}
|
||||||
if (i.first == mismatch.second) {
|
if (i.first == mismatch.second) {
|
||||||
LogPrintf(" (2)");
|
LogPrintf(" (2)"); /* Continued */
|
||||||
}
|
}
|
||||||
LogPrintf(" %s\n", i.second.ToString());
|
LogPrintf(" %s\n", i.second.ToString());
|
||||||
}
|
}
|
||||||
|
|
|
@ -370,7 +370,7 @@ bool CCoinsViewDB::Upgrade() {
|
||||||
|
|
||||||
int64_t count = 0;
|
int64_t count = 0;
|
||||||
LogPrintf("Upgrading utxo-set database...\n");
|
LogPrintf("Upgrading utxo-set database...\n");
|
||||||
LogPrintf("[0%%]...");
|
LogPrintf("[0%%]..."); /* Continued */
|
||||||
uiInterface.ShowProgress(_("Upgrading UTXO database"), 0, true);
|
uiInterface.ShowProgress(_("Upgrading UTXO database"), 0, true);
|
||||||
size_t batch_size = 1 << 24;
|
size_t batch_size = 1 << 24;
|
||||||
CDBBatch batch(db);
|
CDBBatch batch(db);
|
||||||
|
@ -389,7 +389,7 @@ bool CCoinsViewDB::Upgrade() {
|
||||||
uiInterface.ShowProgress(_("Upgrading UTXO database"), percentageDone, true);
|
uiInterface.ShowProgress(_("Upgrading UTXO database"), percentageDone, true);
|
||||||
if (reportDone < percentageDone/10) {
|
if (reportDone < percentageDone/10) {
|
||||||
// report max. every 10% step
|
// report max. every 10% step
|
||||||
LogPrintf("[%d%%]...", percentageDone);
|
LogPrintf("[%d%%]...", percentageDone); /* Continued */
|
||||||
reportDone = percentageDone/10;
|
reportDone = percentageDone/10;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2231,13 +2231,13 @@ void static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainPar
|
||||||
DoWarning(strWarning);
|
DoWarning(strWarning);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)", __func__,
|
LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)", __func__, /* Continued */
|
||||||
pindexNew->GetBlockHash().ToString(), pindexNew->nHeight, pindexNew->nVersion,
|
pindexNew->GetBlockHash().ToString(), pindexNew->nHeight, pindexNew->nVersion,
|
||||||
log(pindexNew->nChainWork.getdouble())/log(2.0), (unsigned long)pindexNew->nChainTx,
|
log(pindexNew->nChainWork.getdouble())/log(2.0), (unsigned long)pindexNew->nChainTx,
|
||||||
FormatISO8601DateTime(pindexNew->GetBlockTime()),
|
FormatISO8601DateTime(pindexNew->GetBlockTime()),
|
||||||
GuessVerificationProgress(chainParams.TxData(), pindexNew), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
|
GuessVerificationProgress(chainParams.TxData(), pindexNew), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
|
||||||
if (!warningMessages.empty())
|
if (!warningMessages.empty())
|
||||||
LogPrintf(" warning='%s'", boost::algorithm::join(warningMessages, ", "));
|
LogPrintf(" warning='%s'", boost::algorithm::join(warningMessages, ", ")); /* Continued */
|
||||||
LogPrintf("\n");
|
LogPrintf("\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -3903,14 +3903,14 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
|
||||||
int nGoodTransactions = 0;
|
int nGoodTransactions = 0;
|
||||||
CValidationState state;
|
CValidationState state;
|
||||||
int reportDone = 0;
|
int reportDone = 0;
|
||||||
LogPrintf("[0%%]...");
|
LogPrintf("[0%%]..."); /* Continued */
|
||||||
for (CBlockIndex* pindex = chainActive.Tip(); pindex && pindex->pprev; pindex = pindex->pprev)
|
for (CBlockIndex* pindex = chainActive.Tip(); pindex && pindex->pprev; pindex = pindex->pprev)
|
||||||
{
|
{
|
||||||
boost::this_thread::interruption_point();
|
boost::this_thread::interruption_point();
|
||||||
int percentageDone = std::max(1, std::min(99, (int)(((double)(chainActive.Height() - pindex->nHeight)) / (double)nCheckDepth * (nCheckLevel >= 4 ? 50 : 100))));
|
int percentageDone = std::max(1, std::min(99, (int)(((double)(chainActive.Height() - pindex->nHeight)) / (double)nCheckDepth * (nCheckLevel >= 4 ? 50 : 100))));
|
||||||
if (reportDone < percentageDone/10) {
|
if (reportDone < percentageDone/10) {
|
||||||
// report every 10% step
|
// report every 10% step
|
||||||
LogPrintf("[%d%%]...", percentageDone);
|
LogPrintf("[%d%%]...", percentageDone); /* Continued */
|
||||||
reportDone = percentageDone/10;
|
reportDone = percentageDone/10;
|
||||||
}
|
}
|
||||||
uiInterface.ShowProgress(_("Verifying blocks..."), percentageDone, false);
|
uiInterface.ShowProgress(_("Verifying blocks..."), percentageDone, false);
|
||||||
|
|
|
@ -3076,7 +3076,7 @@ bool CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::ve
|
||||||
wtxNew.fTimeReceivedIsTxTime = true;
|
wtxNew.fTimeReceivedIsTxTime = true;
|
||||||
wtxNew.fFromMe = true;
|
wtxNew.fFromMe = true;
|
||||||
|
|
||||||
LogPrintf("CommitTransaction:\n%s", wtxNew.tx->ToString());
|
LogPrintf("CommitTransaction:\n%s", wtxNew.tx->ToString()); /* Continued */
|
||||||
{
|
{
|
||||||
// Take key pair from key pool so it won't be used again
|
// Take key pair from key pool so it won't be used again
|
||||||
reservekey.KeepKey();
|
reservekey.KeepKey();
|
||||||
|
|
Loading…
Reference in a new issue