Merge bitcoin#20690: Clean up logging of outbound connection type

MarcoFalke · knst · commit 41a1e1095465 · 2024-04-09T22:34:37.000+07:00
6d1e85f Clean up logging of outbound connection type (Suhas Daftuar) Pull request description: We have a function that converts `ConnectionType` enums to strings, so use it. Suggested by ajtowns in bitcoin#19858 (comment) ACKs for top commit: amitiuttarwar: ACK 6d1e85f naumenkogs: ACK 6d1e85f Tree-SHA512: f5084d8b5257380696d9fde86a8873e190cd4553feb07fa49df39bbd9510bf5832d190a3bca1571c48370d16a17c7a34900857b21b27bec0777bfa710211d7bb
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -3281,7 +3281,7 @@ void PeerManagerImpl::ProcessMessage(
             LogPrintf("New outbound peer connected: version: %d, blocks=%d, peer=%d%s (%s)\n",
                       pfrom.nVersion.load(), peer->m_starting_height,
                       pfrom.GetId(), (fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToString()) : ""),
-                      pfrom.IsBlockOnlyConn()?  "block-relay" : "full-relay");
+                      pfrom.ConnectionTypeAsString());
         }
 
         if (!pfrom.m_masternode_probe_connection) {

Original file line number	Diff line number	Diff line change
`@@ -3281,7 +3281,7 @@ void PeerManagerImpl::ProcessMessage(`
`3281`	`3281`	`LogPrintf("New outbound peer connected: version: %d, blocks=%d, peer=%d%s (%s)\n",`
`3282`	`3282`	`pfrom.nVersion.load(), peer->m_starting_height,`
`3283`	`3283`	`pfrom.GetId(), (fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToString()) : ""),`
`3284`		`- pfrom.IsBlockOnlyConn()? "block-relay" : "full-relay");`
	`3284`	`+ pfrom.ConnectionTypeAsString());`
`3285`	`3285`	`}`
`3286`	`3286`
`3287`	`3287`	`if (!pfrom.m_masternode_probe_connection) {`