From: Matt Joiner <anacrolix@gmail.com>
Date: Sat, 18 Apr 2020 07:45:01 +0000 (+1000)
Subject: Logging fixes
X-Git-Tag: v1.16.0~65
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=4a2802a702e9e6dd58b9302bf9e9cab558e0d7fe;p=btrtrc.git

Logging fixes
---

diff --git a/peerconn.go b/peerconn.go
index bfc935e7..a2652da9 100644
--- a/peerconn.go
+++ b/peerconn.go
@@ -1124,9 +1124,10 @@ func (c *PeerConn) onReadExtendedMsg(id pp.ExtensionNumber, payload []byte) (err
 	case pp.HandshakeExtendedID:
 		var d pp.ExtendedHandshakeMessage
 		if err := bencode.Unmarshal(payload, &d); err != nil {
-			c.t.logger.Printf("error parsing extended handshake message %q: %s", payload, err)
+			c.logger.Printf("error parsing extended handshake message %q: %s", payload, err)
 			return errors.Wrap(err, "unmarshalling extended handshake payload")
 		}
+		//c.logger.WithDefaultLevel(log.Debug).Printf("received extended handshake message:\n%s", spew.Sdump(d))
 		if d.Reqq != 0 {
 			c.PeerMaxRequests = d.Reqq
 		}
diff --git a/torrent.go b/torrent.go
index c2da92e2..998a05bc 100644
--- a/torrent.go
+++ b/torrent.go
@@ -270,7 +270,7 @@ func (t *Torrent) addPeer(p Peer) (added bool) {
 	if replaced, ok := t.peers.AddReturningReplacedPeer(p); ok {
 		torrent.Add("peers replaced", 1)
 		if !replaced.Equal(p) {
-			t.logger.Printf("added %v replacing %v", p, replaced)
+			t.logger.WithDefaultLevel(log.Debug).Printf("added %v replacing %v", p, replaced)
 			added = true
 		}
 	} else {
@@ -1343,7 +1343,7 @@ func (t *Torrent) startScrapingTracker(_url string) {
 			go func() {
 				err := wst.TrackerClient.Run(ar, u.String())
 				if err != nil {
-					t.logger.WithDefaultLevel(log.Error).Printf(
+					t.logger.WithDefaultLevel(log.Warning).Printf(
 						"error running websocket tracker announcer for %q: %v",
 						u.String(), err)
 				}