From f61f14dae03c6de660cd9959821dd509bde35dbc Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Wed, 21 Aug 2019 20:55:43 +1000 Subject: [PATCH] Make Reader log through its parent --- go.mod | 2 +- reader.go | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 1d36cf63..2924eeeb 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/anacrolix/dht/v2 v2.0.1 github.com/anacrolix/envpprof v1.0.0 github.com/anacrolix/go-libutp v1.0.2 - github.com/anacrolix/log v0.2.2-0.20190821103111-726085c46ea1 + github.com/anacrolix/log v0.2.2-0.20190821105323-e3efcaf1a0fd github.com/anacrolix/missinggo v1.2.1 github.com/anacrolix/missinggo/perf v1.0.0 github.com/anacrolix/mmsg v1.0.0 // indirect diff --git a/reader.go b/reader.go index 24403dc1..cb612f9f 100644 --- a/reader.go +++ b/reader.go @@ -4,9 +4,9 @@ import ( "context" "errors" "io" - "log" "sync" + "github.com/anacrolix/log" "github.com/anacrolix/missinggo" ) @@ -224,10 +224,10 @@ func (r *reader) readOnceAt(b []byte, pos int64, ctxErr *error) (n int, err erro r.t.cl.lock() // TODO: Just reset pieces in the readahead window. This might help // prevent thrashing with small caches and file and piece priorities. - log.Printf("error reading torrent %s piece %d offset %d, %d bytes: %v", - r.t.infoHash.HexString(), pi, po, len(b1), err) + r.log(log.Fstr("error reading torrent %s piece %d offset %d, %d bytes: %v", + r.t.infoHash.HexString(), pi, po, len(b1), err)) if !r.t.updatePieceCompletion(pi) { - log.Printf("piece %d completion unchanged", pi) + r.log(log.Fstr("piece %d completion unchanged", pi)) } r.t.cl.unlock() } @@ -272,3 +272,7 @@ func (r *reader) Seek(off int64, whence int) (ret int64, err error) { r.posChanged() return } + +func (r *reader) log(m log.Msg) { + r.t.logger.Log(m) +} -- 2.44.0