diff options
| author | Anthony Towns <aj@erisian.com.au> | 2020-12-18 07:41:34 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2021-01-28 16:04:04 +1000 |
| commit | 98fab37ca0517bfe58296e47266cd5bd112e90bf (patch) | |
| tree | 1f96dfc9201173194d094a317540f4538d2d7976 | |
| parent | 12302105bb0bf14721e91b7a3a9d1bf83c8d4154 (diff) | |
| download | bitcoin-98fab37ca0517bfe58296e47266cd5bd112e90bf.tar.xz | |
net: use peer=N instead of from=N in debug log
| -rw-r--r-- | src/net.cpp | 4 | ||||
| -rwxr-xr-x | test/functional/p2p_timeouts.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/net.cpp b/src/net.cpp index 6f4ab2ee06..76bf7effa4 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1231,7 +1231,7 @@ bool CConnman::InactivityCheck(const CNode& node) const } if (node.nLastRecv == 0 || node.nLastSend == 0) { - LogPrint(BCLog::NET, "socket no message in first %i seconds, %d %d from %d\n", m_peer_connect_timeout, node.nLastRecv != 0, node.nLastSend != 0, node.GetId()); + LogPrint(BCLog::NET, "socket no message in first %i seconds, %d %d peer=%d\n", m_peer_connect_timeout, node.nLastRecv != 0, node.nLastSend != 0, node.GetId()); return true; } @@ -1254,7 +1254,7 @@ bool CConnman::InactivityCheck(const CNode& node) const } if (!node.fSuccessfullyConnected) { - LogPrint(BCLog::NET, "version handshake timeout from %d\n", node.GetId()); + LogPrint(BCLog::NET, "version handshake timeout peer=%d\n", node.GetId()); return true; } diff --git a/test/functional/p2p_timeouts.py b/test/functional/p2p_timeouts.py index 47832b04bf..a7e240dcfa 100755 --- a/test/functional/p2p_timeouts.py +++ b/test/functional/p2p_timeouts.py @@ -74,9 +74,9 @@ class TimeoutsTest(BitcoinTestFramework): no_version_node.send_message(msg_ping()) expected_timeout_logs = [ - "version handshake timeout from 0", - "socket no message in first 3 seconds, 1 0 from 1", - "socket no message in first 3 seconds, 0 0 from 2", + "version handshake timeout peer=0", + "socket no message in first 3 seconds, 1 0 peer=1", + "socket no message in first 3 seconds, 0 0 peer=2", ] with self.nodes[0].assert_debug_log(expected_msgs=expected_timeout_logs): |