fix(all) log.Debug -> log.Debugf
Brian Tiger Chow committed
Oct 30, 2014 at 06:35 UTC
cea398b8a7644d972bc9f3c75c728289d3b162b5
16 files changed
+30
-30
core/commands/block.go
+2
-2
@@ -28,7 +28,7 @@ func BlockGet(n *core.IpfsNode, args []string, opts map[string]interface{}, out
28
}
29
30
k := u.Key(h)
31
- log.Debug("BlockGet key: '%q'", k)
31
+ log.Debugf("BlockGet key: '%q'", k)
32
ctx, _ := context.WithTimeout(context.TODO(), time.Second*5)
33
b, err := n.Blocks.GetBlock(ctx, k)
34
if err != nil {
@@ -48,7 +48,7 @@ func BlockPut(n *core.IpfsNode, args []string, opts map[string]interface{}, out
48
}
49
50
b := blocks.NewBlock(data)
51
- log.Debug("BlockPut key: '%q'", b.Key())
51
+ log.Debugf("BlockPut key: '%q'", b.Key())
52
53
k, err := n.Blocks.AddBlock(b)
54
if err != nil {
core/commands/object.go
+3
-3
@@ -19,7 +19,7 @@ func ObjectData(n *core.IpfsNode, args []string, opts map[string]interface{}, ou
19
if err != nil {
20
return fmt.Errorf("objectData error: %v", err)
21
}
22
- log.Debug("objectData: found dagnode %q (# of bytes: %d - # links: %d)", args[0], len(dagnode.Data), len(dagnode.Links))
22
+ log.Debugf("objectData: found dagnode %q (# of bytes: %d - # links: %d)", args[0], len(dagnode.Data), len(dagnode.Links))
23
24
_, err = io.Copy(out, bytes.NewReader(dagnode.Data))
25
return err
@@ -31,7 +31,7 @@ func ObjectLinks(n *core.IpfsNode, args []string, opts map[string]interface{}, o
31
if err != nil {
32
return fmt.Errorf("objectLinks error: %v", err)
33
}
34
- log.Debug("ObjectLinks: found dagnode %q (# of bytes: %d - # links: %d)", args[0], len(dagnode.Data), len(dagnode.Links))
34
+ log.Debugf("ObjectLinks: found dagnode %q (# of bytes: %d - # links: %d)", args[0], len(dagnode.Data), len(dagnode.Links))
35
36
for _, link := range dagnode.Links {
37
_, err = fmt.Fprintf(out, "%s %d %q\n", link.Hash.B58String(), link.Size, link.Name)
@@ -70,7 +70,7 @@ func ObjectGet(n *core.IpfsNode, args []string, opts map[string]interface{}, out
70
if err != nil {
71
return fmt.Errorf("ObjectGet error: %v", err)
72
}
73
- log.Debug("objectGet: found dagnode %q (# of bytes: %d - # links: %d)", args[0], len(dagnode.Data), len(dagnode.Links))
73
+ log.Debugf("objectGet: found dagnode %q (# of bytes: %d - # links: %d)", args[0], len(dagnode.Data), len(dagnode.Links))
74
75
// sadly all encodings dont implement a common interface
76
var data []byte
daemon/daemon.go
+1
-1
@@ -117,7 +117,7 @@ func (dl *DaemonListener) handleConnection(conn manet.Conn) {
117
return
118
}
119
120
- log.Debug("Got command: %v", command)
120
+ log.Debugf("Got command: %v", command)
121
switch command.Command {
122
case "add":
123
err = commands.Add(dl.node, command.Args, command.Opts, conn)
daemon/daemon_client.go
+1
-1
@@ -25,7 +25,7 @@ func getDaemonAddr(confdir string) (string, error) {
25
}
26
fi, err := os.Open(confdir + "/rpcaddress")
27
if err != nil {
28
- log.Debug("getDaemonAddr failed: %s", err)
28
+ log.Debugf("getDaemonAddr failed: %s", err)
29
if err == os.ErrNotExist {
30
return "", ErrDaemonNotRunning
31
}
fuse/ipns/link_unix.go
+1
-1
@@ -19,6 +19,6 @@ func (l *Link) Attr() fuse.Attr {
19
}
20
21
func (l *Link) Readlink(req *fuse.ReadlinkRequest, intr fs.Intr) (string, fuse.Error) {
22
- log.Debug("ReadLink: %s", l.Target)
22
+ log.Debugf("ReadLink: %s", l.Target)
23
return l.Target, nil
24
}
fuse/readonly/readonly_unix.go
+1
-1
@@ -113,7 +113,7 @@ func (s *Node) Attr() fuse.Attr {
113
114
// Lookup performs a lookup under this node.
115
func (s *Node) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
116
- log.Debug("Lookup '%s'", name)
116
+ log.Debugf("Lookup '%s'", name)
117
nd, err := s.Ipfs.Resolver.ResolveLinks(s.Nd, []string{name})
118
if err != nil {
119
// todo: make this error more versatile.
merkledag/merkledag.go
+1
-1
@@ -175,7 +175,7 @@ type dagService struct {
175
// Add adds a node to the dagService, storing the block in the BlockService
176
func (n *dagService) Add(nd *Node) (u.Key, error) {
177
k, _ := nd.Key()
178
- log.Debug("DagService Add [%s]", k)
178
+ log.Debugf("DagService Add [%s]", k)
179
if n == nil {
180
return "", fmt.Errorf("dagService is nil")
181
}
namesys/publisher.go
+1
-1
@@ -27,7 +27,7 @@ func NewRoutingPublisher(route routing.IpfsRouting) Publisher {
27
28
// Publish implements Publisher. Accepts a keypair and a value,
29
func (p *ipnsPublisher) Publish(k ci.PrivKey, value string) error {
30
- log.Debug("namesys: Publish %s", value)
30
+ log.Debugf("namesys: Publish %s", value)
31
32
// validate `value` is a ref (multihash)
33
_, err := mh.FromB58String(value)
namesys/routing.go
+1
-1
@@ -35,7 +35,7 @@ func (r *routingResolver) CanResolve(name string) bool {
35
// Resolve implements Resolver. Uses the IPFS routing system to resolve SFS-like
36
// names.
37
func (r *routingResolver) Resolve(name string) (string, error) {
38
- log.Debug("RoutingResolve: '%s'", name)
38
+ log.Debugf("RoutingResolve: '%s'", name)
39
ctx := context.TODO()
40
hash, err := mh.FromB58String(name)
41
if err != nil {
net/conn/conn.go
+1
-1
@@ -89,7 +89,7 @@ func newSingleConn(ctx context.Context, local, remote peer.Peer,
89
90
// close is the internal close function, called by ContextCloser.Close
91
func (c *singleConn) close() error {
92
- log.Debug("%s closing Conn with %s", c.local, c.remote)
92
+ log.Debugf("%s closing Conn with %s", c.local, c.remote)
93
94
// close underlying connection
95
err := c.maconn.Close()
net/swarm/swarm_test.go
+3
-3
@@ -25,7 +25,7 @@ func pong(ctx context.Context, swarm *Swarm) {
25
if bytes.Equal(m1.Data(), []byte("ping")) {
26
m2 := msg.New(m1.Peer(), []byte("pong"))
27
i++
28
- log.Debug("%s pong %s (%d)", swarm.local, m1.Peer(), i)
28
+ log.Debugf("%s pong %s (%d)", swarm.local, m1.Peer(), i)
29
swarm.Outgoing <- m2
30
}
31
}
@@ -130,14 +130,14 @@ func SubtestSwarm(t *testing.T, addrs []string, MsgNum int) {
130
131
for k := 0; k < MsgNum; k++ {
132
for _, p := range *peers {
133
- log.Debug("%s ping %s (%d)", s1.local, p, k)
133
+ log.Debugf("%s ping %s (%d)", s1.local, p, k)
134
s1.Outgoing <- msg.New(p, []byte("ping"))
135
}
136
}
137
138
got := map[u.Key]int{}
139
for k := 0; k < (MsgNum * len(*peers)); k++ {
140
- log.Debug("%s waiting for pong (%d)", s1.local, k)
140
+ log.Debugf("%s waiting for pong (%d)", s1.local, k)
141
msg := <-s1.Incoming
142
if string(msg.Data()) != "pong" {
143
t.Error("unexpected conn output", msg.Data)
path/path.go
+1
-1
@@ -22,7 +22,7 @@ type Resolver struct {
22
// path component as a hash (key) of the first node, then resolves
23
// all other components walking the links, with ResolveLinks.
24
func (s *Resolver) ResolvePath(fpath string) (*merkledag.Node, error) {
25
- log.Debug("Resolve: '%s'", fpath)
25
+ log.Debugf("Resolve: '%s'", fpath)
26
fpath = path.Clean(fpath)
27
28
parts := strings.Split(fpath, "/")
pin/indirect.go
+1
-1
@@ -32,7 +32,7 @@ func loadIndirPin(d ds.Datastore, k ds.Key) (*indirectPin, error) {
32
keys = append(keys, k)
33
refcnt[k] = v
34
}
35
- log.Debug("indirPin keys: %#v", keys)
35
+ log.Debugf("indirPin keys: %#v", keys)
36
37
return &indirectPin{blockset: set.SimpleSetFromKeys(keys), refCounts: refcnt}, nil
38
}
routing/dht/ext_test.go
+1
-1
@@ -245,7 +245,7 @@ func TestNotFound(t *testing.T) {
245
246
ctx, _ = context.WithTimeout(ctx, time.Second*5)
247
v, err := d.GetValue(ctx, u.Key("hello"))
248
- log.Debug("get value got %v", v)
248
+ log.Debugf("get value got %v", v)
249
if err != nil {
250
switch err {
251
case routing.ErrNotFound:
routing/dht/query.go
+10
-10
@@ -107,7 +107,7 @@ func newQueryRunner(ctx context.Context, q *dhtQuery) *dhtQueryRunner {
107
}
108
109
func (r *dhtQueryRunner) Run(peers []peer.Peer) (*dhtQueryResult, error) {
110
- log.Debug("Run query with %d peers.", len(peers))
110
+ log.Debugf("Run query with %d peers.", len(peers))
111
if len(peers) == 0 {
112
log.Warning("Running query with no peers!")
113
return nil, nil
@@ -176,7 +176,7 @@ func (r *dhtQueryRunner) addPeerToQuery(next peer.Peer, benchmark peer.Peer) {
176
r.peersSeen[next.Key()] = next
177
r.Unlock()
178
179
- log.Debug("adding peer to query: %v\n", next)
179
+ log.Debugf("adding peer to query: %v\n", next)
180
181
// do this after unlocking to prevent possible deadlocks.
182
r.peersRemaining.Increment(1)
@@ -200,14 +200,14 @@ func (r *dhtQueryRunner) spawnWorkers() {
200
if !more {
201
return // channel closed.
202
}
203
- log.Debug("spawning worker for: %v\n", p)
203
+ log.Debugf("spawning worker for: %v\n", p)
204
go r.queryPeer(p)
205
}
206
}
207
}
208
209
func (r *dhtQueryRunner) queryPeer(p peer.Peer) {
210
- log.Debug("spawned worker for: %v\n", p)
210
+ log.Debugf("spawned worker for: %v\n", p)
211
212
// make sure we rate limit concurrency.
213
select {
@@ -218,12 +218,12 @@ func (r *dhtQueryRunner) queryPeer(p peer.Peer) {
218
}
219
220
// ok let's do this!
221
- log.Debug("running worker for: %v", p)
221
+ log.Debugf("running worker for: %v", p)
222
223
// make sure we do this when we exit
224
defer func() {
225
// signal we're done proccessing peer p
226
- log.Debug("completing worker for: %v", p)
226
+ log.Debugf("completing worker for: %v", p)
227
r.peersRemaining.Decrement(1)
228
r.rateLimit <- struct{}{}
229
}()
@@ -232,7 +232,7 @@ func (r *dhtQueryRunner) queryPeer(p peer.Peer) {
232
// (Incidentally, this will add it to the peerstore too)
233
err := r.query.dialer.DialPeer(p)
234
if err != nil {
235
- log.Debug("ERROR worker for: %v -- err connecting: %v", p, err)
235
+ log.Debugf("ERROR worker for: %v -- err connecting: %v", p, err)
236
r.Lock()
237
r.errs = append(r.errs, err)
238
r.Unlock()
@@ -243,20 +243,20 @@ func (r *dhtQueryRunner) queryPeer(p peer.Peer) {
243
res, err := r.query.qfunc(r.ctx, p)
244
245
if err != nil {
246
- log.Debug("ERROR worker for: %v %v", p, err)
246
+ log.Debugf("ERROR worker for: %v %v", p, err)
247
r.Lock()
248
r.errs = append(r.errs, err)
249
r.Unlock()
250
251
} else if res.success {
252
- log.Debug("SUCCESS worker for: %v", p, res)
252
+ log.Debugf("SUCCESS worker for: %v", p, res)
253
r.Lock()
254
r.result = res
255
r.Unlock()
256
r.cancel() // signal to everyone that we're done.
257
258
} else if res.closerPeers != nil {
259
- log.Debug("PEERS CLOSER -- worker for: %v\n", p)
259
+ log.Debugf("PEERS CLOSER -- worker for: %v\n", p)
260
for _, next := range res.closerPeers {
261
r.addPeerToQuery(next, p)
262
}
routing/dht/routing.go
+1
-1
@@ -247,7 +247,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.Peer, error)
247
return nil, err
248
}
249
250
- log.Debug("FindPeer %v %v", id, result.success)
250
+ log.Debugf("FindPeer %v %v", id, result.success)
251
if result.peer == nil {
252
return nil, routing.ErrNotFound
253
}