Add some String methods and contextual information in log messages

diff --git a/client.go b/client.go
index 5e074b3e664c0c0bc3dfcc33c5a9cf18ed7f1845..f94c8f57181e9bce8390a6e39e352057306ab439 100644 (file)
--- a/client.go
+++ b/client.go
@@ -632,7 +632,7 @@ newAnnounce:
                                        log.Print(err)
                                        return
                                }
-                               log.Printf("%d new peers from %s", len(peers), "TODO")
+                               log.Printf("%s: %d new peers from %s", t, len(peers), tr)
                                tier[0], tier[trIndex] = tier[trIndex], tier[0]
                                time.Sleep(time.Second * time.Duration(resp.Interval))
                                continue newAnnounce
@@ -755,7 +755,7 @@ func (me *Client) pieceHashed(t *torrent, piece peer_protocol.Integer, correct b
        p.EverHashed = true
        if correct {
                p.PendingChunkSpecs = nil
-               log.Printf("got piece %d, (%d/%d)", piece, t.NumPiecesCompleted(), t.NumPieces())
+               log.Printf("%s: got piece %d, (%d/%d)", t, piece, t.NumPiecesCompleted(), t.NumPieces())
                var next *list.Element
                if t.Priorities != nil {
                        for e := t.Priorities.Front(); e != nil; e = next {

diff --git a/torrent.go b/torrent.go
index b0808df9669cd6e128ef8ad1ff1ed1114837b3b1..c747986e81558f228fa52bed95631d21099ffeb0 100644 (file)
--- a/torrent.go
+++ b/torrent.go
@@ -37,6 +37,10 @@ type torrent struct {
        Trackers [][]tracker.Client
 }
 
+func (t *torrent) String() string {
+       return t.MetaInfo.Name
+}
+
 func (t *torrent) NumPieces() int {
        return len(t.MetaInfo.Pieces) / pieceHash.Size()
 }

diff --git a/tracker/tracker.go b/tracker/tracker.go
index 820880b408657480ee1308957b0adda8bbba73db..ffae4341757f933b3bd4126080eb3bb4a41fc652 100644 (file)
--- a/tracker/tracker.go
+++ b/tracker/tracker.go
@@ -44,6 +44,7 @@ type Client interface {
        // Returns ErrNotConnected if Connect needs to be called.
        Announce(*AnnounceRequest) (AnnounceResponse, error)
        Connect() error
+       String() string
 }
 
 var (

diff --git a/tracker/udp/udp_tracker.go b/tracker/udp/udp_tracker.go
index 76a5ca52acdea54c96da0295da5f9aea2f631482..b53c762418d3cfb28d461e4a18d7f36359ef88ab 100644 (file)
--- a/tracker/udp/udp_tracker.go
+++ b/tracker/udp/udp_tracker.go
@@ -87,6 +87,10 @@ type client struct {
        url                  *url.URL
 }
 
+func (c *client) String() string {
+       return c.url.String()
+}
+
 func (c *client) Announce(req *tracker.AnnounceRequest) (res tracker.AnnounceResponse, err error) {
        if !c.connected() {
                err = tracker.ErrNotConnected