From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 13 Apr 2020 04:17:46 +0000 (+1000)
Subject: Improve webtorrent tracker client logging
X-Git-Tag: v1.16.0~85^2~5
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=1b3cbc12877fcf897b7048db9e9a088b00785544;p=btrtrc.git

Improve webtorrent tracker client logging
---

diff --git a/torrent.go b/torrent.go
index 4875bf5b..a5c51bf8 100644
--- a/torrent.go
+++ b/torrent.go
@@ -1317,7 +1317,10 @@ func (t *Torrent) startScrapingTracker(_url string) {
 	sl := func() torrentTrackerAnnouncer {
 		switch u.Scheme {
 		case "ws", "wss":
-			wst := websocketTracker{*u, webtorrent.NewClient(t.cl.peerID, t.infoHash, t.onWebRtcConn, t.logger)}
+			wst := websocketTracker{*u, webtorrent.NewClient(t.cl.peerID, t.infoHash, t.onWebRtcConn,
+				t.logger.WithText(func(m log.Msg) string {
+					return fmt.Sprintf("%q: %v", u.String(), m.Text())
+				}))}
 			go func() {
 				err := wst.Client.Run(t.announceRequest(tracker.Started), u.String())
 				if err != nil {
diff --git a/webtorrent/client.go b/webtorrent/client.go
index 54ebf264..9d232d02 100644
--- a/webtorrent/client.go
+++ b/webtorrent/client.go
@@ -180,7 +180,7 @@ func (c *Client) trackerReadLoop() error {
 				c.logger.WithValues(log.Warning).Printf("could not find offer for id %q", ar.OfferID)
 				continue
 			}
-			log.Printf("offer %q got answer %v", ar.OfferID, *ar.Answer)
+			c.logger.Printf("offer %q got answer %v", ar.OfferID, *ar.Answer)
 			err = offer.transport.SetAnswer(*ar.Answer, func(dc datachannel.ReadWriteCloser) {
 				c.onConn(dc, DataChannelContext{
 					Local:        offer.originalOffer,
@@ -190,7 +190,7 @@ func (c *Client) trackerReadLoop() error {
 				})
 			})
 			if err != nil {
-				return fmt.Errorf("failed to sent answer: %v", err)
+				return fmt.Errorf("failed to sent answer: %w", err)
 			}
 		}
 	}