client.go | 4 ++-- torrent.go | 6 +++--- diff --git a/client.go b/client.go index c2e01ee56ace962f1815859a69414bd082ab1414..4fac27220f10c302ec2271e4580448a298522f4f 100644 --- a/client.go +++ b/client.go @@ -783,7 +783,7 @@ if opts.requireRendezvous && !rzOk { return nil, err } if err != nil { - log.Print(err) + t.logger.Print(err) } dialCtx, cancel := context.WithTimeout(context.Background(), func() time.Duration { cl.rLock() @@ -1294,7 +1294,7 @@ } t.smartBanCache.Hash = sha1.Sum t.smartBanCache.Init() t.networkingEnabled.Set() - t.logger = cl.logger.WithContextValue(t).WithNames("torrent", t.infoHash.HexString()) + t.logger = cl.logger.WithContextValue(t).WithNames("torrent", t.infoHash.HexString()).WithDefaultLevel(log.Debug) t.sourcesLogger = t.logger.WithNames("sources") if opts.ChunkSize == 0 { opts.ChunkSize = defaultChunkSize diff --git a/torrent.go b/torrent.go index 978619cc7dd9794a404fefd77005eba2e29cc08c..eef9c0cb8da16ca8a5924e5918633a57e69953c0 100644 --- a/torrent.go +++ b/torrent.go @@ -2723,7 +2723,7 @@ func (t *Torrent) handleReceivedUtHolepunchMsg(msg utHolepunch.Msg, sender *PeerConn) error { switch msg.MsgType { case utHolepunch.Rendezvous: - log.Printf("got holepunch rendezvous request for %v from %p", msg.AddrPort, sender) + t.logger.Printf("got holepunch rendezvous request for %v from %p", msg.AddrPort, sender) sendMsg := sendUtHolepunchMsg targets := t.peerConnsWithRemoteAddrPort(msg.AddrPort) if len(targets) == 0 { @@ -2740,7 +2740,7 @@ sendMsg(pc, utHolepunch.Connect, sender.remoteAddrPort().Unwrap(), 0) } return nil case utHolepunch.Connect: - log.Printf("got holepunch connect from %v for %v", sender, msg.AddrPort) + t.logger.Printf("got holepunch connect from %v for %v", sender, msg.AddrPort) rz, ok := t.utHolepunchRendezvous[msg.AddrPort] if ok { delete(rz.relays, sender) @@ -2761,7 +2761,7 @@ if ok { delete(rz.relays, sender) rz.relayCond.Broadcast() } - log.Printf("received ut_holepunch error message from %v: %v", sender, msg.ErrCode) + t.logger.Printf("received ut_holepunch error message from %v: %v", sender, msg.ErrCode) return nil default: return fmt.Errorf("unhandled msg type %v", msg.MsgType)