Merge #20690: Clean up logging of outbound connection type

MarcoFalke · MarcoFalke · commit 83e4670fd7cd · 2020-12-18T10:02:55.000+01: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/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
@@ -2476,7 +2476,7 @@ void PeerManager::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDat
             LogPrintf("New outbound peer connected: version: %d, blocks=%d, peer=%d%s (%s)\n",
                       pfrom.nVersion.load(), pfrom.nStartingHeight,
                       pfrom.GetId(), (fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToString()) : ""),
-                      pfrom.IsBlockOnlyConn() ? "block-relay" : "full-relay");
+                      pfrom.ConnectionTypeAsString());
         }
 
         if (pfrom.GetCommonVersion() >= SENDHEADERS_VERSION) {

Original file line number	Diff line number	Diff line change
`@@ -2476,7 +2476,7 @@ void PeerManager::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDat`
`2476`	`2476`	`LogPrintf("New outbound peer connected: version: %d, blocks=%d, peer=%d%s (%s)\n",`
`2477`	`2477`	`pfrom.nVersion.load(), pfrom.nStartingHeight,`
`2478`	`2478`	`pfrom.GetId(), (fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToString()) : ""),`
`2479`		`- pfrom.IsBlockOnlyConn() ? "block-relay" : "full-relay");`
	`2479`	`+ pfrom.ConnectionTypeAsString());`
`2480`	`2480`	`}`
`2481`	`2481`
`2482`	`2482`	`if (pfrom.GetCommonVersion() >= SENDHEADERS_VERSION) {`