Fix panic in webseed request rejection logging

[btrtrc.git] / web_seed.go

diff --git a/web_seed.go b/web_seed.go
index 72bda5fde0bdf755b0a175ea37ea90f7bf4bfba2..c2bb78e1bddb1a0285d59ee8a39ed147fd4b9224 100644 (file)
--- a/web_seed.go
+++ b/web_seed.go
@@ -1,9 +1,9 @@
 package torrent
 
 import (
+       "fmt"
        "net/http"
 
-       "github.com/anacrolix/log"
        "github.com/anacrolix/torrent/common"
        "github.com/anacrolix/torrent/metainfo"
        pp "github.com/anacrolix/torrent/peer_protocol"
@@ -34,6 +34,10 @@ type webSeed struct {
 
 var _ peerImpl = (*webSeed)(nil)
 
+func (ws *webSeed) String() string {
+       return fmt.Sprintf("webseed peer for %q", ws.client.Url)
+}
+
 func (ws *webSeed) onGotInfo(info *metainfo.Info) {
        ws.client.FileIndex = segments.NewIndex(common.LengthIterFromUpvertedFiles(info.UpvertedFiles()))
        ws.client.Info = info
@@ -81,7 +85,7 @@ func (ws *webSeed) requestResultHandler(r request, webseedRequest webseed.Reques
        ws.peer.t.cl.lock()
        defer ws.peer.t.cl.unlock()
        if result.Err != nil {
-               log.Printf("webseed request rejected: %v", result.Err)
+               ws.peer.logger.Printf("request %v rejected: %v", r, result.Err)
                ws.peer.remoteRejectedRequest(r)
        } else {
                err := ws.peer.receiveChunk(&pp.Message{