[logs] fix zapwallettxes startup logs
This commit is contained in:
parent
e7a2181b49
commit
4c3b538c61
1 changed files with 7 additions and 6 deletions
|
@ -4043,18 +4043,19 @@ bool CWallet::ParameterInteraction()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// -zapwallettx implies dropping the mempool on startup
|
int zapwallettxes = GetArg("-zapwallettxes", 0);
|
||||||
if (GetBoolArg("-zapwallettxes", false) && SoftSetBoolArg("-persistmempool", false)) {
|
// -zapwallettxes implies dropping the mempool on startup
|
||||||
LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -persistmempool=0\n", __func__);
|
if (zapwallettxes != 0 && SoftSetBoolArg("-persistmempool", false)) {
|
||||||
|
LogPrintf("%s: parameter interaction: -zapwallettxes=%s -> setting -persistmempool=0\n", __func__, zapwallettxes);
|
||||||
}
|
}
|
||||||
|
|
||||||
// -zapwallettx implies a rescan
|
// -zapwallettxes implies a rescan
|
||||||
if (GetBoolArg("-zapwallettxes", false)) {
|
if (zapwallettxes != 0) {
|
||||||
if (is_multiwallet) {
|
if (is_multiwallet) {
|
||||||
return InitError(strprintf("%s is only allowed with a single wallet file", "-zapwallettxes"));
|
return InitError(strprintf("%s is only allowed with a single wallet file", "-zapwallettxes"));
|
||||||
}
|
}
|
||||||
if (SoftSetBoolArg("-rescan", true)) {
|
if (SoftSetBoolArg("-rescan", true)) {
|
||||||
LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);
|
LogPrintf("%s: parameter interaction: -zapwallettxes=%s -> setting -rescan=1\n", __func__, zapwallettxes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue