Improve protocol behaviour logging

diff --git a/go.mod b/go.mod
index a6c5566a07013ba739bd50bb21a0f67e5b685a34..662ff999e9496dd5e5aeb8f0b1eada3f8e9063f8 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
        github.com/anacrolix/dht/v2 v2.10.6-0.20211007004332-99263ec9c1c8
        github.com/anacrolix/envpprof v1.1.1
        github.com/anacrolix/go-libutp v1.0.4
-       github.com/anacrolix/log v0.9.0
+       github.com/anacrolix/log v0.10.0
        github.com/anacrolix/missinggo v1.3.0
        github.com/anacrolix/missinggo/perf v1.0.0
        github.com/anacrolix/missinggo/v2 v2.5.2

diff --git a/go.sum b/go.sum
index e66fab10369966cf893d85846cd7950c002b5c5a..667d81c564a6d099f39bbc5744ff69f83148fef7 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,8 @@ github.com/anacrolix/log v0.7.1-0.20200604014615-c244de44fd2d/go.mod h1:s5yBP/j0
 github.com/anacrolix/log v0.8.0/go.mod h1:s5yBP/j046fm9odtUTbHOfDUq/zh1W8OkPpJtnX0oQI=
 github.com/anacrolix/log v0.9.0 h1:HD1Ml3WV/6lRbITKqi5EIS3e9rVOGHej5V9UaQA4cvY=
 github.com/anacrolix/log v0.9.0/go.mod h1:s5yBP/j046fm9odtUTbHOfDUq/zh1W8OkPpJtnX0oQI=
+github.com/anacrolix/log v0.10.0 h1:uz9XDnmsw8ZEO/TTRU03lL7I74PlgVRFszYqPZ39WNY=
+github.com/anacrolix/log v0.10.0/go.mod h1:s5yBP/j046fm9odtUTbHOfDUq/zh1W8OkPpJtnX0oQI=
 github.com/anacrolix/missinggo v0.0.0-20180522035225-b4a5853e62ff/go.mod h1:b0p+7cn+rWMIphK1gDH2hrDuwGOcbB6V4VXeSsEfHVk=
 github.com/anacrolix/missinggo v0.0.0-20180725070939-60ef2fbf63df/go.mod h1:kwGiTUTZ0+p4vAz3VbAI5a30t2YbvemcmspjKwrAz5s=
 github.com/anacrolix/missinggo v0.2.1-0.20190310234110-9fbdc9f242a8/go.mod h1:MBJu3Sk/k3ZfGYcS7z18gwfu72Ey/xopPFJJbTi5yIo=

diff --git a/peerconn.go b/peerconn.go
index 2b27706a20e9f4fea9310dc88685741e76ab2eab..a5d1581f436ed11062e89f11f4b759be842a8cd3 100644 (file)
--- a/peerconn.go
+++ b/peerconn.go
@@ -1009,7 +1009,7 @@ func runSafeExtraneous(f func()) {
 func (c *PeerConn) logProtocolBehaviour(level log.Level, format string, arg ...interface{}) {
        c.logger.WithLevel(level).WithContextText(fmt.Sprintf(
                "peer id %q, ext v %q", c.PeerID, c.PeerClientName,
-       )).Printf(format, arg...)
+       )).SkipCallers(1).Printf(format, arg...)
 }
 
 // Processes incoming BitTorrent wire-protocol messages. The client lock is held upon entry and