diff options
author | MacroFake <falke.marco@gmail.com> | 2022-09-01 17:22:27 +0200 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-09-01 17:07:45 +0200 |
commit | fa4c59d65bdf1c64056b18a58f8aaa2800995aa6 (patch) | |
tree | 984428eaf47f8b31d6b73d12b6b4da33b425ead0 | |
parent | fa3358b668d8415adc1b5586caa382fe4140ad42 (diff) | |
download | bitcoin-fa4c59d65bdf1c64056b18a58f8aaa2800995aa6.tar.xz |
Move blockstorage option logging to LoadChainstate()
-rw-r--r-- | src/init.cpp | 2 | ||||
-rw-r--r-- | src/node/chainstate.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 2eb3de54f5..3226b42846 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -938,14 +938,12 @@ bool AppInitParameterInteraction(const ArgsManager& args, bool use_syscall_sandb } nPruneTarget = (uint64_t) nPruneArg * 1024 * 1024; if (nPruneArg == 1) { // manual pruning: -prune=1 - LogPrintf("Block pruning enabled. Use RPC call pruneblockchain(height) to manually prune block and undo files.\n"); nPruneTarget = std::numeric_limits<uint64_t>::max(); fPruneMode = true; } else if (nPruneTarget) { if (nPruneTarget < MIN_DISK_SPACE_FOR_BLOCK_FILES) { return InitError(strprintf(_("Prune configured below the minimum of %d MiB. Please use a higher number."), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); } - LogPrintf("Prune configured to target %u MiB on disk for block and undo files.\n", nPruneTarget / 1024 / 1024); fPruneMode = true; } diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp index 8e2b5c45f7..c4dd9ba6c5 100644 --- a/src/node/chainstate.cpp +++ b/src/node/chainstate.cpp @@ -41,6 +41,11 @@ ChainstateLoadResult LoadChainstate(ChainstateManager& chainman, const CacheSize if (nMinimumChainWork < UintToArith256(chainman.GetConsensus().nMinimumChainWork)) { LogPrintf("Warning: nMinimumChainWork set below default value of %s\n", chainman.GetConsensus().nMinimumChainWork.GetHex()); } + if (nPruneTarget == std::numeric_limits<uint64_t>::max()) { + LogPrintf("Block pruning enabled. Use RPC call pruneblockchain(height) to manually prune block and undo files.\n"); + } else if (nPruneTarget) { + LogPrintf("Prune configured to target %u MiB on disk for block and undo files.\n", nPruneTarget / 1024 / 1024); + } LOCK(cs_main); chainman.InitializeChainstate(options.mempool); |