mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-22 06:52:36 +01:00
log: renamed disk to file so wording was more accurate
This commit is contained in:
parent
b9f04be870
commit
4d5b55735b
1 changed files with 8 additions and 8 deletions
|
@ -44,7 +44,7 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, Chainstate& active
|
|||
|
||||
AutoFile file{opts.mockable_fopen_function(load_path, "rb")};
|
||||
if (file.IsNull()) {
|
||||
LogPrintf("Failed to open mempool file from disk. Continuing anyway.\n");
|
||||
LogInfo("Failed to open mempool file. Continuing anyway.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -70,12 +70,12 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, Chainstate& active
|
|||
uint64_t total_txns_to_load;
|
||||
file >> total_txns_to_load;
|
||||
uint64_t txns_tried = 0;
|
||||
LogInfo("Loading %u mempool transactions from disk...\n", total_txns_to_load);
|
||||
LogInfo("Loading %u mempool transactions from file...\n", total_txns_to_load);
|
||||
int next_tenth_to_report = 0;
|
||||
while (txns_tried < total_txns_to_load) {
|
||||
const int percentage_done(100.0 * txns_tried / total_txns_to_load);
|
||||
if (next_tenth_to_report < percentage_done / 10) {
|
||||
LogInfo("Progress loading mempool transactions from disk: %d%% (tried %u, %u remaining)\n",
|
||||
LogInfo("Progress loading mempool transactions from file: %d%% (tried %u, %u remaining)\n",
|
||||
percentage_done, txns_tried, total_txns_to_load - txns_tried);
|
||||
next_tenth_to_report = percentage_done / 10;
|
||||
}
|
||||
|
@ -138,11 +138,11 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, Chainstate& active
|
|||
}
|
||||
}
|
||||
} catch (const std::exception& e) {
|
||||
LogPrintf("Failed to deserialize mempool data on disk: %s. Continuing anyway.\n", e.what());
|
||||
LogInfo("Failed to deserialize mempool data on file: %s. Continuing anyway.\n", e.what());
|
||||
return false;
|
||||
}
|
||||
|
||||
LogPrintf("Imported mempool transactions from disk: %i succeeded, %i failed, %i expired, %i already there, %i waiting for initial broadcast\n", count, failed, expired, already_there, unbroadcast);
|
||||
LogInfo("Imported mempool transactions from file: %i succeeded, %i failed, %i expired, %i already there, %i waiting for initial broadcast\n", count, failed, expired, already_there, unbroadcast);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -186,7 +186,7 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock
|
|||
|
||||
uint64_t mempool_transactions_to_write(vinfo.size());
|
||||
file << mempool_transactions_to_write;
|
||||
LogInfo("Writing %u mempool transactions to disk...\n", mempool_transactions_to_write);
|
||||
LogInfo("Writing %u mempool transactions to file...\n", mempool_transactions_to_write);
|
||||
for (const auto& i : vinfo) {
|
||||
file << TX_WITH_WITNESS(*(i.tx));
|
||||
file << int64_t{count_seconds(i.m_time)};
|
||||
|
@ -196,7 +196,7 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock
|
|||
|
||||
file << mapDeltas;
|
||||
|
||||
LogPrintf("Writing %d unbroadcast transactions to disk.\n", unbroadcast_txids.size());
|
||||
LogInfo("Writing %d unbroadcast transactions to file.\n", unbroadcast_txids.size());
|
||||
file << unbroadcast_txids;
|
||||
|
||||
if (!skip_file_commit && !FileCommit(file.Get()))
|
||||
|
@ -212,7 +212,7 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock
|
|||
Ticks<SecondsDouble>(last - mid),
|
||||
fs::file_size(dump_path));
|
||||
} catch (const std::exception& e) {
|
||||
LogPrintf("Failed to dump mempool: %s. Continuing anyway.\n", e.what());
|
||||
LogInfo("Failed to dump mempool: %s. Continuing anyway.\n", e.what());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
Loading…
Add table
Reference in a new issue