Trivial: Debug log ambiguity fix for peer addrs #9861

keystrike commented at 12:42 AM on February 26, 2017: contributor

This line can be misinterpreted as loading wallet addresses which is confusing, especially when the wallet is disabled.

fanquake added the label Docs and Output on Feb 26, 2017

fanquake added the label P2P on Feb 26, 2017

kallewoof commented at 1:32 AM on February 26, 2017: member

I'm unsure why the filename is needed, esp since it is printed in both outcomes later. If it is needed, you would need filename for banlist.dat load as well (line 2228), no?

keystrike commented at 1:51 AM on February 26, 2017: contributor

The filename isn't as important as stating that p2p addresses are being loaded rather than wallet addresses. I added the filename just to be sure it was clear. This line happens shortly after "mapAddressBook.size() = 1" in debug.log, so it isn't obvious what these addresses are -- especially confusing when -disablewallet is set.

It may help if I explain why I noticed this. Previous versions of bitcoin would log setKeyPool.size, mapWallet.size, etc., even when the wallet was disabled, but that has now been fixed. So this line now stands out.

in src/net.cpp:None in 600c1c5b40 outdated

2210 | @@ -2211,7 +2211,7 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
2211 |  
2212 |      clientInterface = connOptions.uiInterface;
2213 |      if (clientInterface)
2214 | -        clientInterface->InitMessage(_("Loading addresses..."));
2215 | +        clientInterface->InitMessage(_("Loading p2p addresses from peers.dat..."));

MarcoFalke commented at 12:06 PM on February 26, 2017:

No need to mention the file name in a translated message. Also missing curly braces {} according to style guide.

in src/net.cpp:None in 8adba4a417 outdated

2209 | @@ -2210,8 +2210,9 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
2210 |      SetBestHeight(connOptions.nBestHeight);
2211 |  
2212 |      clientInterface = connOptions.uiInterface;
2213 | -    if (clientInterface)
2214 | -        clientInterface->InitMessage(_("Loading addresses..."));
2215 | +    if (clientInterface) {
2216 | +        clientInterface->InitMessage(_("Loading p2p addresses..."));

laanwj commented at 9:39 AM on February 27, 2017:

s/p2p/P2P

MarcoFalke commented at 12:58 PM on February 27, 2017: member

After fixing the nit, please squash your commits according to https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#squashing-commits

keystrike commented at 7:13 PM on February 27, 2017: contributor

I'm sorry, I made a mistake when trying to squash my commits. Would someone please help?

laanwj commented at 11:24 AM on February 28, 2017: member

@keystrike: the git 'reflog' has a backup of all your past HEADs, so nothing will be lost, you can restore your old state if you can find it (with reset --hard <commitid>) and re-do from there.

Having said that, for small changes the easiest solution is sometimes to start over and just re-do your change and copy the commit message.

Trivial: Debug log ambiguity fix for peer addrs

This line can be misinterpreted as loading wallet addresses which is confusing, especially when the wallet is disabled.

6d37ee8314

laanwj merged this on Mar 1, 2017

laanwj closed this on Mar 1, 2017

laanwj referenced this in commit 22f609f25a on Mar 1, 2017

keystrike deleted the branch on Mar 1, 2017

PastaPastaPasta referenced this in commit fb22bb3666 on Dec 28, 2018

PastaPastaPasta referenced this in commit 24985a184f on Dec 29, 2018

PastaPastaPasta referenced this in commit e34c4e79dc on Dec 29, 2018

PastaPastaPasta referenced this in commit ce04f75654 on Dec 31, 2018

PastaPastaPasta referenced this in commit 96f44d9625 on Jan 2, 2019

PastaPastaPasta referenced this in commit 8a74bf29e9 on Jan 3, 2019

PastaPastaPasta referenced this in commit fd2abbfc32 on Jan 5, 2019

PastaPastaPasta referenced this in commit 4fd3afa381 on Jan 7, 2019

PastaPastaPasta referenced this in commit fd93740f1d on Jan 7, 2019

PastaPastaPasta referenced this in commit 3977923553 on Jan 23, 2019

PastaPastaPasta referenced this in commit d7ed114165 on Jan 25, 2019

MarcoFalke locked this on Sep 8, 2021