-
Notifications
You must be signed in to change notification settings - Fork 36.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make sure LogPrintf strings are line-terminated #6497
Conversation
ACK |
} | ||
LogPrint("estimatefee", "\n"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be ugly, but it was working correctly before right? This will cause extra new lines I think, because NewTx above prints a new line. I guess we could just remove it from there. This may be a case of too much debugging, I'm not sure if we want all these anyway....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Original code:
LogPrint("estimatefee", "Blockpolicy mempool tx %s ", hash.ToString().substr(0,10));
// Record this as a priority estimate
if (entry.GetFee() == 0 || isPriDataPoint(feeRate, curPri)) {
...
}
// Record this as a fee estimate
else if (isFeeDataPoint(feeRate, curPri)) {
...
}
else {
LogPrint("estimatefee", "not adding\n");
}
So the line will not be terminated unless the if() condition falls through.
But if you insist I'll remove this change...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I apologize for the ugly code again, but in the if
and else if
, feeStats
and priStats
both call NewTx
respectively. NewTx
adds a new line. I'd suggest leaving your change, but removing the new line in the LogPrint
call in NewTx
. Or, removing all the LogPrint
lines altogether, what are your thoughts about the level of debugging? I found this useful in writing this code and for certain modifications it would be also valuable, but perhaps doesn't have much everyday value. I'm running into the same questions in the mempool limiting code where debugging the various failures is valuable when working on the code but perhaps not when its finished until someone wants to change it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, will do that.
This is optional debugging, so I think having it in the first place is fine. It can be useful if someone wants to troubleshoot the fee estimation, which I'm sure has to happen at some point.
ACK though agree @morcos has a point |
utACK for trivial-branch |
Fix the cases where LogPrint[f] was accidentally called without line terminator, which resulted in concatenated log lines. (see e.g. bitcoin#6492)
5d7fc47
to
f18b8ec
Compare
Ok, updated for @morcos' comment |
f18b8ec Make sure LogPrintf strings are line-terminated (Wladimir J. van der Laan)
Fix the cases where LogPrint[f] was accidentally called without line terminator, which resulted in concatenated log lines.
(see e.g. #6492)