Make Reader log through its parent

diff --git a/go.mod b/go.mod
index 1d36cf6339d0d0777dc9e11aa1c81371c3eb133f..2924eeeb43ebe8fff9d5b1f1f7d2a14af6125c63 100644 (file)
--- 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 24403dc17f75f06a0b588c403c0337323820fb4c..cb612f9f07c08534b09482de306357c962db5f67 100644 (file)
--- 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)
+}