[Trivial] [logging] Rm extraneous cleansubver in serveral debug messages #6646

pull gmaxwell wants to merge 1 commits into bitcoin:master from gmaxwell:lesssubver changing 1 files +5 −6

gmaxwell commented at 8:28 AM on September 7, 2015: contributor

We log the cleanSubVer as part of connect. It is not uniquely more informative than any of the other data we have about a peer, often less. It's also often long now as well. There is no need to output it as part of mempoolrej, AcceptToMemoryPool, or pong entries. Leaving it out makes our log entries more uniform and consistent.
gmaxwell added the label Trivial on Sep 7, 2015
gmaxwell added the label Block storage on Sep 7, 2015
gmaxwell removed the label Block storage on Sep 7, 2015
gmaxwell added the label Docs and Output on Sep 7, 2015
dcousens commented at 1:24 PM on September 7, 2015: contributor

concept/utACK
paveljanik commented at 1:35 PM on September 7, 2015: contributor

ACK
sipa commented at 3:38 PM on September 7, 2015: member

ACK
petertodd commented at 5:08 PM on September 7, 2015: contributor

utACK
gmaxwell commented at 8:39 PM on September 7, 2015: contributor

@paveljanik OK, I was trying to avoid gratuitously breaking parser, but fair enough. Changed.
fanquake commented at 9:57 PM on September 7, 2015: member

utACK
btcdrak commented at 11:25 PM on September 7, 2015: contributor

utACK

[Trivial] [logging] Rm extraneous cleansubver in serveral debug messages.

We log the cleanSubVer as part of connect.  It is not uniquely more informative
 than any of the other data we have about a peer, often less.  It's also often
 long now as well.  There is no need to output it as part of mempoolrej,
 AcceptToMemoryPool, or pong entries.  Leaving it out makes our log entries
 more uniform and consistent.

6ecaec395c

in src/main.cpp:None in 9ee9616a89 outdated

4343 | @@ -4344,8 +4344,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
4344 |          int nDoS = 0;
4345 |          if (state.IsInvalid(nDoS))
4346 |          {
4347 | -            LogPrint("mempoolrej", "%s from peer=%d %s was not accepted into the memory pool: %s\n", tx.GetHash().ToString(),
4348 | -                pfrom->id, pfrom->cleanSubVer,
4349 | +            LogPrint("mempoolrej", "%s from peer=%d was not accepted into the memory pool: %s\n", tx.GetHash().ToString(),

laanwj commented at 2:17 PM on September 8, 2015:

Now that we're changing this message: can we shorten it even further? I introduced this, but as it appears quite often (when mempoolrej enabled), I'd prefer a shorter formulation. Maybe "was not accepted" is enough?

petertodd commented at 2:45 PM on September 8, 2015:

ACK

gmaxwell commented at 11:12 PM on September 8, 2015: contributor

Okay. Message shorter as requested by @laanwj
jgarzik commented at 11:35 PM on September 15, 2015: contributor

ut ACK

travis death in rpc tests is unrelated?
MarcoFalke commented at 8:54 AM on September 16, 2015: member

Yes, unrelated. It's #6655.
paveljanik commented at 5:25 PM on September 19, 2015: contributor

Ready to merge.
laanwj merged this on Sep 23, 2015
laanwj closed this on Sep 23, 2015
laanwj referenced this in commit 6264e5b378 on Sep 23, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels