@cryptotaxi247 / kubo / commits / 184c25430

go-vet friendly codebase

- distinguish log.Error and log.Errorf functions - Initialize structs with field names - A bit of unreachable code (defers)

Juan Batiz-Benet committed Oct 25, 2014 at 03:17 UTC 184c25430b32139a5d9b38951dec3610ef973b7a
38 files changed +187 -188
blocks/set/dbset.go
+2 -1
@@ -11,6 +11,7 @@ type datastoreBlockSet struct {
11 bset BlockSet
12 }
13
14 +// NewDBWrapperSet returns a new blockset wrapping a given datastore
15 func NewDBWrapperSet(d ds.Datastore, bset BlockSet) BlockSet {
16 return &datastoreBlockSet{
17 dstore: d,
@@ -21,7 +22,7 @@ func NewDBWrapperSet(d ds.Datastore, bset BlockSet) BlockSet {
22 func (d *datastoreBlockSet) AddBlock(k util.Key) {
23 err := d.dstore.Put(k.DsKey(), []byte{})
24 if err != nil {
24 - log.Error("blockset put error: %s", err)
25 + log.Errorf("blockset put error: %s", err)
26 }
27
28 d.bset.AddBlock(k)
commands/cli/parse_test.go
+4 -4
@@ -26,10 +26,10 @@ func TestOptionParsing(t *testing.T) {
26 t.Error("Should have passed")
27 }
28 if len(opts) != 4 || opts["beep"] != "" || opts["boop"] != "lol" || opts["c"] != "" || opts["foo"] != "5" {
29 - t.Error("Returned options were defferent than expected: %v", opts)
29 + t.Errorf("Returned options were defferent than expected: %v", opts)
30 }
31 if len(input) != 2 || input[0] != "test2" || input[1] != "beep" {
32 - t.Error("Returned input was different than expected: %v", input)
32 + t.Errorf("Returned input was different than expected: %v", input)
33 }
34
35 _, _, err = parseOptions([]string{"-beep=1", "-boop=2", "-beep=3"})
@@ -39,9 +39,9 @@ func TestOptionParsing(t *testing.T) {
39
40 path, args := parsePath([]string{"test", "beep", "boop"}, cmd)
41 if len(path) != 1 || path[0] != "test" {
42 - t.Error("Returned path was defferent than expected: %v", path)
42 + t.Errorf("Returned path was defferent than expected: %v", path)
43 }
44 if len(args) != 2 || args[0] != "beep" || args[1] != "boop" {
45 - t.Error("Returned args were different than expected: %v", args)
45 + t.Errorf("Returned args were different than expected: %v", args)
46 }
47 }
commands/command_test.go
+2 -2
@@ -73,8 +73,8 @@ func TestOptionValidation(t *testing.T) {
73 req = NewEmptyRequest()
74 req.SetOption("b", ":)")
75 res = cmd.Call(req)
76 - if res.Error == nil {
77 - t.Error(res.Error, "Should have failed (string value not convertible to int)")
76 + if res.Error() == nil {
77 + t.Error(res.Error(), "Should have failed (string value not convertible to int)")
78 }
79 }
80
core/commands/refs.go
+1 -1
@@ -43,7 +43,7 @@ func printRefs(n *core.IpfsNode, nd *mdag.Node, refSeen map[u.Key]bool, recursiv
43 if recursive {
44 nd, err := n.DAG.Get(u.Key(link.Hash))
45 if err != nil {
46 - log.Error("error: cannot retrieve %s (%s)\n", link.Hash.B58String(), err)
46 + log.Errorf("error: cannot retrieve %s (%s)", link.Hash.B58String(), err)
47 return
48 }
49
core/core.go
+5 -5
@@ -6,8 +6,8 @@ import (
6 "fmt"
7
8 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9 - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9 b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
10 + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
11 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
13 bserv "github.com/jbenet/go-ipfs/blockservice"
@@ -230,25 +230,25 @@ func initIdentity(cfg *config.Config, peers peer.Peerstore, online bool) (peer.P
230 func initConnections(ctx context.Context, cfg *config.Config, pstore peer.Peerstore, route *dht.IpfsDHT) {
231 for _, p := range cfg.Bootstrap {
232 if p.PeerID == "" {
233 - log.Error("error: peer does not include PeerID. %v", p)
233 + log.Errorf("error: peer does not include PeerID. %v", p)
234 }
235
236 maddr, err := ma.NewMultiaddr(p.Address)
237 if err != nil {
238 - log.Error("%s", err)
238 + log.Error(err)
239 continue
240 }
241
242 // setup peer
243 npeer, err := pstore.Get(peer.DecodePrettyID(p.PeerID))
244 if err != nil {
245 - log.Error("Bootstrapping error: %v", err)
245 + log.Errorf("Bootstrapping error: %v", err)
246 continue
247 }
248 npeer.AddAddress(maddr)
249
250 if _, err = route.Connect(ctx, npeer); err != nil {
251 - log.Error("Bootstrapping error: %v", err)
251 + log.Errorf("Bootstrapping error: %v", err)
252 }
253 }
254 }
daemon/daemon.go
+3 -3
@@ -53,13 +53,13 @@ func NewDaemonListener(ipfsnode *core.IpfsNode, addr ma.Multiaddr, confdir strin
53
54 ofi, err := os.Create(confdir + "/rpcaddress")
55 if err != nil {
56 - log.Warning("Could not create rpcaddress file: %s", err)
56 + log.Warningf("Could not create rpcaddress file: %s", err)
57 return nil, err
58 }
59
60 _, err = ofi.Write([]byte(addr.String()))
61 if err != nil {
62 - log.Warning("Could not write to rpcaddress file: %s", err)
62 + log.Warningf("Could not write to rpcaddress file: %s", err)
63 return nil, err
64 }
65 ofi.Close()
@@ -148,7 +148,7 @@ func (dl *DaemonListener) handleConnection(conn manet.Conn) {
148 err = fmt.Errorf("Invalid Command: '%s'", command.Command)
149 }
150 if err != nil {
151 - log.Error("%s: %s", command.Command, err)
151 + log.Errorf("%s: %s", command.Command, err)
152 fmt.Fprintln(conn, err)
153 }
154 }
daemon/daemon_client.go
+1 -1
@@ -72,7 +72,7 @@ func serverIsRunning(confdir string) bool {
72 var err error
73 confdir, err = u.TildeExpansion(confdir)
74 if err != nil {
75 - log.Error("Tilde Expansion Failed: %s", err)
75 + log.Errorf("Tilde Expansion Failed: %s", err)
76 return false
77 }
78 lk, err := daemonLock(confdir)
diagnostics/diag.go
+13 -13
@@ -105,7 +105,7 @@ func (d *Diagnostics) GetDiagnostic(timeout time.Duration) ([]*DiagInfo, error)
105 log.Debug("Begin Diagnostic")
106
107 peers := d.getPeers()
108 - log.Debug("Sending diagnostic request to %d peers.", len(peers))
108 + log.Debugf("Sending diagnostic request to %d peers.", len(peers))
109
110 var out []*DiagInfo
111 di := d.getDiagInfo()
@@ -116,12 +116,12 @@ func (d *Diagnostics) GetDiagnostic(timeout time.Duration) ([]*DiagInfo, error)
116 respdata := make(chan []byte)
117 sends := 0
118 for _, p := range peers {
119 - log.Debug("Sending getDiagnostic to: %s", p)
119 + log.Debugf("Sending getDiagnostic to: %s", p)
120 sends++
121 go func(p peer.Peer) {
122 data, err := d.getDiagnosticFromPeer(ctx, p, pmes)
123 if err != nil {
124 - log.Error("GetDiagnostic error: %v", err)
124 + log.Errorf("GetDiagnostic error: %v", err)
125 respdata <- nil
126 return
127 }
@@ -147,7 +147,7 @@ func AppendDiagnostics(data []byte, cur []*DiagInfo) []*DiagInfo {
147 err := dec.Decode(di)
148 if err != nil {
149 if err != io.EOF {
150 - log.Error("error decoding DiagInfo: %v", err)
150 + log.Errorf("error decoding DiagInfo: %v", err)
151 }
152 break
153 }
@@ -189,7 +189,7 @@ func (d *Diagnostics) sendRequest(ctx context.Context, p peer.Peer, pmes *pb.Mes
189 }
190
191 rtt := time.Since(start)
192 - log.Info("diagnostic request took: %s", rtt.String())
192 + log.Infof("diagnostic request took: %s", rtt.String())
193
194 rpmes := new(pb.Message)
195 if err := proto.Unmarshal(rmes.Data(), rpmes); err != nil {
@@ -200,7 +200,7 @@ func (d *Diagnostics) sendRequest(ctx context.Context, p peer.Peer, pmes *pb.Mes
200 }
201
202 func (d *Diagnostics) handleDiagnostic(p peer.Peer, pmes *pb.Message) (*pb.Message, error) {
203 - log.Debug("HandleDiagnostic from %s for id = %s", p, pmes.GetDiagID())
203 + log.Debugf("HandleDiagnostic from %s for id = %s", p, pmes.GetDiagID())
204 resp := newMessage(pmes.GetDiagID())
205 d.diagLock.Lock()
206 _, found := d.diagMap[pmes.GetDiagID()]
@@ -220,12 +220,12 @@ func (d *Diagnostics) handleDiagnostic(p peer.Peer, pmes *pb.Message) (*pb.Messa
220 respdata := make(chan []byte)
221 sendcount := 0
222 for _, p := range d.getPeers() {
223 - log.Debug("Sending diagnostic request to peer: %s", p)
223 + log.Debugf("Sending diagnostic request to peer: %s", p)
224 sendcount++
225 go func(p peer.Peer) {
226 out, err := d.getDiagnosticFromPeer(ctx, p, pmes)
227 if err != nil {
228 - log.Error("getDiagnostic error: %v", err)
228 + log.Errorf("getDiagnostic error: %v", err)
229 respdata <- nil
230 return
231 }
@@ -237,7 +237,7 @@ func (d *Diagnostics) handleDiagnostic(p peer.Peer, pmes *pb.Message) (*pb.Messa
237 out := <-respdata
238 _, err := buf.Write(out)
239 if err != nil {
240 - log.Error("getDiagnostic write output error: %v", err)
240 + log.Errorf("getDiagnostic write output error: %v", err)
241 continue
242 }
243 }
@@ -263,18 +263,18 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, mes msg.NetMessage) msg
263 pmes := new(pb.Message)
264 err := proto.Unmarshal(mData, pmes)
265 if err != nil {
266 - log.Error("Failed to decode protobuf message: %v", err)
266 + log.Errorf("Failed to decode protobuf message: %v", err)
267 return nil
268 }
269
270 // Print out diagnostic
271 - log.Info("[peer: %s] Got message from [%s]\n",
271 + log.Infof("[peer: %s] Got message from [%s]\n",
272 d.self.ID().Pretty(), mPeer.ID().Pretty())
273
274 // dispatch handler.
275 rpmes, err := d.handleDiagnostic(mPeer, pmes)
276 if err != nil {
277 - log.Error("handleDiagnostic error: %s", err)
277 + log.Errorf("handleDiagnostic error: %s", err)
278 return nil
279 }
280
@@ -286,7 +286,7 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, mes msg.NetMessage) msg
286 // serialize response msg
287 rmes, err := msg.FromObject(mPeer, rpmes)
288 if err != nil {
289 - log.Error("Failed to encode protobuf message: %v", err)
289 + log.Errorf("Failed to encode protobuf message: %v", err)
290 return nil
291 }
292
exchange/bitswap/bitswap.go
+2 -2
@@ -88,13 +88,13 @@ func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error)
88 log.Debug("bitswap dialing peer: %s", p)
89 err := bs.sender.DialPeer(p)
90 if err != nil {
91 - log.Error("Error sender.DialPeer(%s)", p)
91 + log.Errorf("Error sender.DialPeer(%s)", p)
92 return
93 }
94
95 response, err := bs.sender.SendRequest(ctx, p, message)
96 if err != nil {
97 - log.Error("Error sender.SendRequest(%s)", p)
97 + log.Errorf("Error sender.SendRequest(%s)", p)
98 return
99 }
100 // FIXME ensure accounting is handled correctly when
fuse/ipns/ipns_test.go
+4 -4
@@ -254,7 +254,7 @@ func TestFastRepublish(t *testing.T) {
254 hasPublished := func() bool {
255 res, err := node.Namesys.Resolve(pubkeyHash)
256 if err != nil {
257 - t.Fatal("resolve err: %v", err)
257 + t.Fatalf("resolve err: %v", err)
258 }
259 return res != resolvedHash
260 }
@@ -264,7 +264,7 @@ func TestFastRepublish(t *testing.T) {
264 // at this point, should not have written dataA and not have written dataB
265 rbuf, err := ioutil.ReadFile(fname)
266 if err != nil || !bytes.Equal(rbuf, dataA) {
267 - t.Fatal("Data inconsistent! %v %v", err, string(rbuf))
267 + t.Fatalf("Data inconsistent! %v %v", err, string(rbuf))
268 }
269
270 if hasPublished() {
@@ -276,7 +276,7 @@ func TestFastRepublish(t *testing.T) {
276 // at this point, should have written written dataB, but not published it
277 rbuf, err = ioutil.ReadFile(fname)
278 if err != nil || !bytes.Equal(rbuf, dataB) {
279 - t.Fatal("Data inconsistent! %v %v", err, string(rbuf))
279 + t.Fatalf("Data inconsistent! %v %v", err, string(rbuf))
280 }
281
282 if hasPublished() {
@@ -288,7 +288,7 @@ func TestFastRepublish(t *testing.T) {
288 // at this point, should have written written dataB, and published it
289 rbuf, err = ioutil.ReadFile(fname)
290 if err != nil || !bytes.Equal(rbuf, dataB) {
291 - t.Fatal("Data inconsistent! %v %v", err, string(rbuf))
291 + t.Fatalf("Data inconsistent! %v %v", err, string(rbuf))
292 }
293
294 if !hasPublished() {
fuse/ipns/ipns_unix.go
+28 -28
@@ -62,7 +62,7 @@ func CreateRoot(n *core.IpfsNode, keys []ci.PrivKey, ipfsroot string) (*Root, er
62 pub := k.GetPublic()
63 hash, err := pub.Hash()
64 if err != nil {
65 - log.Error("Read Root Error: %s", err)
65 + log.Errorf("Read Root Error: %s", err)
66 return nil, err
67 }
68 root.LocalLink = &Link{u.Key(hash).Pretty()}
@@ -91,7 +91,7 @@ func CreateRoot(n *core.IpfsNode, keys []ci.PrivKey, ipfsroot string) (*Root, er
91 }
92
93 if !u.IsValidHash(pointsTo) {
94 - log.Critical("Got back bad data from namesys resolve! [%s]", pointsTo)
94 + log.Criticalf("Got back bad data from namesys resolve! [%s]", pointsTo)
95 return nil, nil
96 }
97
@@ -132,7 +132,7 @@ func (*Root) Attr() fuse.Attr {
132
133 // Lookup performs a lookup under this node.
134 func (s *Root) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
135 - log.Debug("ipns: Root Lookup: '%s'", name)
135 + log.Debugf("ipns: Root Lookup: '%s'", name)
136 switch name {
137 case "mach_kernel", ".hidden", "._.":
138 // Just quiet some log noise on OS X.
@@ -151,10 +151,10 @@ func (s *Root) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
151 return nd, nil
152 }
153
154 - log.Debug("ipns: Falling back to resolution for [%s].", name)
154 + log.Debugf("ipns: Falling back to resolution for [%s].", name)
155 resolved, err := s.Ipfs.Namesys.Resolve(name)
156 if err != nil {
157 - log.Warning("ipns: namesys resolve error: %s", err)
157 + log.Warningf("ipns: namesys resolve error: %s", err)
158 return nil, fuse.ENOENT
159 }
160
@@ -174,7 +174,7 @@ func (r *Root) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) {
174 pub := k.GetPublic()
175 hash, err := pub.Hash()
176 if err != nil {
177 - log.Error("Read Root Error: %s", err)
177 + log.Errorf("Read Root Error: %s", err)
178 continue
179 }
180 ent := fuse.Dirent{
@@ -220,7 +220,7 @@ func (s *Node) Attr() fuse.Attr {
220 if s.cached == nil {
221 err := s.loadData()
222 if err != nil {
223 - log.Error("Error loading PBData for file: '%s'", s.name)
223 + log.Errorf("Error loading PBData for file: '%s'", s.name)
224 }
225 }
226 switch s.cached.GetType() {
@@ -229,7 +229,7 @@ func (s *Node) Attr() fuse.Attr {
229 case ftpb.Data_File, ftpb.Data_Raw:
230 size, err := ft.DataSize(s.Nd.Data)
231 if err != nil {
232 - log.Error("Error getting size of file: %s", err)
232 + log.Errorf("Error getting size of file: %s", err)
233 size = 0
234 }
235 return fuse.Attr{
@@ -245,7 +245,7 @@ func (s *Node) Attr() fuse.Attr {
245
246 // Lookup performs a lookup under this node.
247 func (s *Node) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
248 - log.Debug("ipns: node[%s] Lookup '%s'", s.name, name)
248 + log.Debugf("ipns: node[%s] Lookup '%s'", s.name, name)
249 nd, err := s.Ipfs.Resolver.ResolveLinks(s.Nd, []string{name})
250 if err != nil {
251 // todo: make this error more versatile.
@@ -294,7 +294,7 @@ func (s *Node) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) {
294
295 // ReadAll reads the object data as file data
296 func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) {
297 - log.Debug("ipns: ReadAll [%s]", s.name)
297 + log.Debugf("ipns: ReadAll [%s]", s.name)
298 r, err := uio.NewDagReader(s.Nd, s.Ipfs.DAG)
299 if err != nil {
300 return nil, err
@@ -303,20 +303,20 @@ func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) {
303 // what if i have a 6TB file? GG RAM.
304 b, err := ioutil.ReadAll(r)
305 if err != nil {
306 - log.Error("[%s] Readall error: %s", s.name, err)
306 + log.Errorf("[%s] Readall error: %s", s.name, err)
307 return nil, err
308 }
309 return b, nil
310 }
311
312 func (n *Node) Write(req *fuse.WriteRequest, resp *fuse.WriteResponse, intr fs.Intr) fuse.Error {
313 - log.Debug("ipns: Node Write [%s]: flags = %s, offset = %d, size = %d", n.name, req.Flags.String(), req.Offset, len(req.Data))
313 + log.Debugf("ipns: Node Write [%s]: flags = %s, offset = %d, size = %d", n.name, req.Flags.String(), req.Offset, len(req.Data))
314
315 if n.dagMod == nil {
316 // Create a DagModifier to allow us to change the existing dag node
317 dmod, err := uio.NewDagModifier(n.Nd, n.Ipfs.DAG, chunk.DefaultSplitter)
318 if err != nil {
319 - log.Error("Error creating dag modifier: %s", err)
319 + log.Errorf("Error creating dag modifier: %s", err)
320 return err
321 }
322 n.dagMod = dmod
@@ -330,13 +330,13 @@ func (n *Node) Write(req *fuse.WriteRequest, resp *fuse.WriteResponse, intr fs.I
330 }
331
332 func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
333 - log.Debug("Got flush request [%s]!", n.name)
333 + log.Debugf("Got flush request [%s]!", n.name)
334
335 // If a write has happened
336 if n.dagMod != nil {
337 newNode, err := n.dagMod.GetNode()
338 if err != nil {
339 - log.Error("Error getting dag node from dagMod: %s", err)
339 + log.Errorf("Error getting dag node from dagMod: %s", err)
340 return err
341 }
342
@@ -344,7 +344,7 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
344 log.Debug("updating self in parent!")
345 err := n.parent.update(n.name, newNode)
346 if err != nil {
347 - log.Critical("error in updating ipns dag tree: %s", err)
347 + log.Criticalf("error in updating ipns dag tree: %s", err)
348 // return fuse.ETHISISPRETTYBAD
349 return err
350 }
@@ -397,20 +397,20 @@ func (n *Node) republishRoot() error {
397 // Add any nodes that may be new to the DAG service
398 err := n.Ipfs.DAG.AddRecursive(root.Nd)
399 if err != nil {
400 - log.Critical("ipns: Dag Add Error: %s", err)
400 + log.Criticalf("ipns: Dag Add Error: %s", err)
401 return err
402 }
403
404 ndkey, err := root.Nd.Key()
405 if err != nil {
406 - log.Error("getKey error: %s", err)
406 + log.Errorf("getKey error: %s", err)
407 return err
408 }
409 log.Debug("Publishing changes!")
410
411 err = n.Ipfs.Namesys.Publish(root.key, ndkey.Pretty())
412 if err != nil {
413 - log.Error("ipns: Publish Failed: %s", err)
413 + log.Errorf("ipns: Publish Failed: %s", err)
414 return err
415 }
416 return nil
@@ -442,7 +442,7 @@ func (n *Node) Mkdir(req *fuse.MkdirRequest, intr fs.Intr) (fs.Node, fuse.Error)
442 if n.parent != nil {
443 err := n.parent.update(n.name, nnode)
444 if err != nil {
445 - log.Critical("Error updating node: %s", err)
445 + log.Criticalf("Error updating node: %s", err)
446 return nil, err
447 }
448 }
@@ -472,7 +472,7 @@ func (n *Node) Mknod(req *fuse.MknodRequest, intr fs.Intr) (fs.Node, fuse.Error)
472 }
473
474 func (n *Node) Create(req *fuse.CreateRequest, resp *fuse.CreateResponse, intr fs.Intr) (fs.Node, fs.Handle, fuse.Error) {
475 - log.Debug("Got create request: %s", req.Name)
475 + log.Debugf("Got create request: %s", req.Name)
476
477 // New 'empty' file
478 nd := &mdag.Node{Data: ft.FilePBData(nil, 0)}
@@ -482,13 +482,13 @@ func (n *Node) Create(req *fuse.CreateRequest, resp *fuse.CreateResponse, intr f
482
483 err := nnode.AddNodeLink(req.Name, nd)
484 if err != nil {
485 - log.Error("Error adding child to node: %s", err)
485 + log.Errorf("Error adding child to node: %s", err)
486 return nil, nil, err
487 }
488 if n.parent != nil {
489 err := n.parent.update(n.name, nnode)
490 if err != nil {
491 - log.Critical("Error updating node: %s", err)
491 + log.Criticalf("Error updating node: %s", err)
492 // Can we panic, please?
493 return nil, nil, err
494 }
@@ -500,7 +500,7 @@ func (n *Node) Create(req *fuse.CreateRequest, resp *fuse.CreateResponse, intr f
500 }
501
502 func (n *Node) Remove(req *fuse.RemoveRequest, intr fs.Intr) fuse.Error {
503 - log.Debug("[%s] Got Remove request: %s", n.name, req.Name)
503 + log.Debugf("[%s] Got Remove request: %s", n.name, req.Name)
504 nnode := n.Nd.Copy()
505 err := nnode.RemoveNodeLink(req.Name)
506 if err != nil {
@@ -511,7 +511,7 @@ func (n *Node) Remove(req *fuse.RemoveRequest, intr fs.Intr) fuse.Error {
511 if n.parent != nil {
512 err := n.parent.update(n.name, nnode)
513 if err != nil {
514 - log.Critical("Error updating node: %s", err)
514 + log.Criticalf("Error updating node: %s", err)
515 return err
516 }
517 }
@@ -521,7 +521,7 @@ func (n *Node) Remove(req *fuse.RemoveRequest, intr fs.Intr) fuse.Error {
521 }
522
523 func (n *Node) Rename(req *fuse.RenameRequest, newDir fs.Node, intr fs.Intr) fuse.Error {
524 - log.Debug("Got Rename request '%s' -> '%s'", req.OldName, req.NewName)
524 + log.Debugf("Got Rename request '%s' -> '%s'", req.OldName, req.NewName)
525 var mdn *mdag.Node
526 for _, l := range n.Nd.Links {
527 if l.Name == req.OldName {
@@ -538,7 +538,7 @@ func (n *Node) Rename(req *fuse.RenameRequest, newDir fs.Node, intr fs.Intr) fus
538 case *Node:
539 err := newDir.Nd.AddNodeLink(req.NewName, mdn)
540 if err != nil {
541 - log.Error("Error adding node to new dir on rename: %s", err)
541 + log.Errorf("Error adding node to new dir on rename: %s", err)
542 return err
543 }
544 default:
@@ -550,7 +550,7 @@ func (n *Node) Rename(req *fuse.RenameRequest, newDir fs.Node, intr fs.Intr) fus
550
551 // Updates the child of this node, specified by name to the given newnode
552 func (n *Node) update(name string, newnode *mdag.Node) error {
553 - log.Debug("update '%s' in '%s'", name, n.name)
553 + log.Debugf("update '%s' in '%s'", name, n.name)
554 nnode := n.Nd.Copy()
555 err := nnode.RemoveNodeLink(name)
556 if err != nil {
fuse/ipns/mount_unix.go
+1 -1
@@ -23,6 +23,7 @@ func Mount(ipfs *core.IpfsNode, fpath string, ipfspath string) error {
23 syscall.SIGTERM, syscall.SIGQUIT)
24
25 go func() {
26 + defer ipfs.Network.Close()
27 <-sigc
28 for {
29 err := Unmount(fpath)
@@ -31,7 +32,6 @@ func Mount(ipfs *core.IpfsNode, fpath string, ipfspath string) error {
32 }
33 time.Sleep(time.Millisecond * 100)
34 }
34 - ipfs.Network.Close()
35 }()
36
37 c, err := fuse.Mount(fpath)
fuse/readonly/readonly_unix.go
+2 -2
@@ -54,7 +54,7 @@ func (*Root) Attr() fuse.Attr {
54
55 // Lookup performs a lookup under this node.
56 func (s *Root) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
57 - log.Debug("Root Lookup: '%s'", name)
57 + log.Debugf("Root Lookup: '%s'", name)
58 switch name {
59 case "mach_kernel", ".hidden", "._.":
60 // Just quiet some log noise on OS X.
@@ -162,6 +162,7 @@ func Mount(ipfs *core.IpfsNode, fpath string) error {
162 syscall.SIGTERM, syscall.SIGQUIT)
163
164 go func() {
165 + defer ipfs.Network.Close()
166 <-sigc
167 for {
168 err := Unmount(fpath)
@@ -170,7 +171,6 @@ func Mount(ipfs *core.IpfsNode, fpath string) error {
171 }
172 time.Sleep(time.Millisecond * 10)
173 }
173 - ipfs.Network.Close()
174 }()
175
176 c, err := fuse.Mount(fpath)
importer/chunk/splitting.go
+2 -2
@@ -8,7 +8,7 @@ import (
8
9 var log = util.Logger("chunk")
10
11 -var DefaultSplitter = &SizeSplitter{1024 * 512}
11 +var DefaultSplitter = &SizeSplitter{Size: 1024 * 512}
12
13 type BlockSplitter interface {
14 Split(r io.Reader) chan []byte
@@ -32,7 +32,7 @@ func (ss *SizeSplitter) Split(r io.Reader) chan []byte {
32 }
33 return
34 }
35 - log.Error("Block split error: %s", err)
35 + log.Errorf("Block split error: %s", err)
36 return
37 }
38 if nread < ss.Size {
importer/importer_test.go
+2 -2
@@ -38,9 +38,9 @@ func TestBuildDag(t *testing.T) {
38
39 //Test where calls to read are smaller than the chunk size
40 func TestSizeBasedSplit(t *testing.T) {
41 - bs := &chunk.SizeSplitter{512}
41 + bs := &chunk.SizeSplitter{Size: 512}
42 testFileConsistency(t, bs, 32*512)
43 - bs = &chunk.SizeSplitter{4096}
43 + bs = &chunk.SizeSplitter{Size: 4096}
44 testFileConsistency(t, bs, 32*4096)
45
46 // Uneven offset
net/conn/conn.go
+2 -2
@@ -138,8 +138,8 @@ func (c *singleConn) Out() chan<- []byte {
138
139 // ID returns the ID of a given Conn.
140 func ID(c Conn) string {
141 - l := fmt.Sprintf("%s/%s", c.LocalMultiaddr(), c.LocalPeer().ID)
142 - r := fmt.Sprintf("%s/%s", c.RemoteMultiaddr(), c.RemotePeer().ID)
141 + l := fmt.Sprintf("%s/%s", c.LocalMultiaddr(), c.LocalPeer().ID())
142 + r := fmt.Sprintf("%s/%s", c.RemoteMultiaddr(), c.RemotePeer().ID())
143 lh := u.Hash([]byte(l))
144 rh := u.Hash([]byte(r))
145 ch := u.XOR(lh, rh)
net/conn/dial.go
+2 -2
@@ -25,14 +25,14 @@ func (d *Dialer) Dial(ctx context.Context, network string, remote peer.Peer) (Co
25
26 remote, err := d.Peerstore.Add(remote)
27 if err != nil {
28 - log.Error("Error putting peer into peerstore: %s", remote)
28 + log.Errorf("Error putting peer into peerstore: %s", remote)
29 }
30
31 // TODO: try to get reusing addr/ports to work.
32 // madialer := manet.Dialer{LocalAddr: laddr}
33 madialer := manet.Dialer{}
34
35 - log.Info("%s dialing %s %s", d.LocalPeer, remote, raddr)
35 + log.Infof("%s dialing %s %s", d.LocalPeer, remote, raddr)
36 maconn, err := madialer.Dial(raddr)
37 if err != nil {
38 return nil, err
net/conn/handshake.go
+6 -6
@@ -26,7 +26,7 @@ func Handshake1(ctx context.Context, c Conn) error {
26 }
27
28 c.Out() <- myVerBytes
29 - log.Debug("Sent my version (%s) to %s", localH, rpeer)
29 + log.Debugf("Sent my version (%s) to %s", localH, rpeer)
30
31 select {
32 case <-ctx.Done():
@@ -50,11 +50,11 @@ func Handshake1(ctx context.Context, c Conn) error {
50 }
51
52 if err := handshake.Handshake1Compatible(localH, remoteH); err != nil {
53 - log.Info("%s (%s) incompatible version with %s (%s)", lpeer, localH, rpeer, remoteH)
53 + log.Infof("%s (%s) incompatible version with %s (%s)", lpeer, localH, rpeer, remoteH)
54 return err
55 }
56
57 - log.Debug("%s version handshake compatible %s", lpeer, rpeer)
57 + log.Debugf("%s version handshake compatible %s", lpeer, rpeer)
58 return nil
59 }
60
@@ -71,7 +71,7 @@ func Handshake3(ctx context.Context, c Conn) error {
71 }
72
73 c.Out() <- localB
74 - log.Debug("Handshake1: sent to %s", rpeer)
74 + log.Debugf("Handshake1: sent to %s", rpeer)
75
76 select {
77 case <-ctx.Done():
@@ -91,11 +91,11 @@ func Handshake3(ctx context.Context, c Conn) error {
91 return fmt.Errorf("Handshake3 could not decode remote msg: %q", err)
92 }
93
94 - log.Debug("Handshake3 received from %s", rpeer)
94 + log.Debugf("Handshake3 received from %s", rpeer)
95 }
96
97 if err := handshake.Handshake3UpdatePeer(rpeer, remoteH); err != nil {
98 - log.Error("Handshake3 failed to update %s", rpeer)
98 + log.Errorf("Handshake3 failed to update %s", rpeer)
99 return err
100 }
101
net/conn/listen.go
+3 -3
@@ -60,13 +60,13 @@ func (l *listener) listen() {
60
61 c, err := newSingleConn(l.ctx, l.local, nil, maconn)
62 if err != nil {
63 - log.Error("Error accepting connection: %v", err)
63 + log.Errorf("Error accepting connection: %v", err)
64 return
65 }
66
67 sc, err := newSecureConn(l.ctx, c, l.peers)
68 if err != nil {
69 - log.Error("Error securing connection: %v", err)
69 + log.Errorf("Error securing connection: %v", err)
70 return
71 }
72
@@ -84,7 +84,7 @@ func (l *listener) listen() {
84 default:
85 }
86
87 - log.Error("Failed to accept connection: %v", err)
87 + log.Errorf("Failed to accept connection: %v", err)
88 continue
89 }
90
net/conn/multiconn.go
+6 -6
@@ -69,13 +69,13 @@ func (c *MultiConn) Add(conns ...Conn) {
69 for _, c2 := range conns {
70 log.Info("MultiConn: adding %s", c2)
71 if c.LocalPeer() != c2.LocalPeer() || c.RemotePeer() != c2.RemotePeer() {
72 - log.Error("%s", c2)
72 + log.Error(c2)
73 c.Unlock() // ok to unlock (to log). panicing.
74 - log.Error("%s", c)
75 - log.Error("c.LocalPeer: %s %p", c.LocalPeer(), c.LocalPeer())
76 - log.Error("c2.LocalPeer: %s %p", c2.LocalPeer(), c2.LocalPeer())
77 - log.Error("c.RemotePeer: %s %p", c.RemotePeer(), c.RemotePeer())
78 - log.Error("c2.RemotePeer: %s %p", c2.RemotePeer(), c2.RemotePeer())
74 + log.Error(c)
75 + // log.Errorf("c.LocalPeer: %s %p", c.LocalPeer(), c.LocalPeer())
76 + // log.Errorf("c2.LocalPeer: %s %p", c2.LocalPeer(), c2.LocalPeer())
77 + // log.Errorf("c.RemotePeer: %s %p", c.RemotePeer(), c.RemotePeer())
78 + // log.Errorf("c2.RemotePeer: %s %p", c2.RemotePeer(), c2.RemotePeer())
79 c.Lock() // gotta relock to avoid lock panic from deferring.
80 panic("connection addresses mismatch")
81 }
net/conn/secure_conn.go
+5 -5
@@ -31,13 +31,13 @@ func newSecureConn(ctx context.Context, insecure Conn, peers peer.Peerstore) (Co
31 }
32 conn.ContextCloser = ctxc.NewContextCloser(ctx, conn.close)
33
34 - log.Debug("newSecureConn: %v to %v", insecure.LocalPeer(), insecure.RemotePeer())
34 + log.Debugf("newSecureConn: %v to %v", insecure.LocalPeer(), insecure.RemotePeer())
35 // perform secure handshake before returning this connection.
36 if err := conn.secureHandshake(peers); err != nil {
37 conn.Close()
38 return nil, err
39 }
40 - log.Debug("newSecureConn: %v to %v handshake success!", insecure.LocalPeer(), insecure.RemotePeer())
40 + log.Debugf("newSecureConn: %v to %v handshake success!", insecure.LocalPeer(), insecure.RemotePeer())
41
42 return conn, nil
43 }
@@ -78,9 +78,9 @@ func (c *secureConn) secureHandshake(peers peer.Peerstore) error {
78 // update: this actually might happen under normal operation-- should
79 // perhaps return an error. TBD.
80
81 - log.Error("secureConn peer mismatch. %v != %v", insecureSC.remote, c.secure.RemotePeer())
82 - log.Error("insecureSC.remote: %s %#v", insecureSC.remote, insecureSC.remote)
83 - log.Error("c.secure.LocalPeer: %s %#v", c.secure.RemotePeer(), c.secure.RemotePeer())
81 + log.Errorf("secureConn peer mismatch. %v != %v", insecureSC.remote, c.secure.RemotePeer())
82 + log.Errorf("insecureSC.remote: %s %#v", insecureSC.remote, insecureSC.remote)
83 + log.Errorf("c.secure.LocalPeer: %s %#v", c.secure.RemotePeer(), c.secure.RemotePeer())
84 panic("secureConn peer mismatch. consructed incorrectly?")
85 }
86
net/handshake/handshake3.go
+1 -1
@@ -44,7 +44,7 @@ func Handshake3UpdatePeer(remotePeer peer.Peer, msg *pb.Handshake3) error {
44 addr, err := ma.NewMultiaddrBytes(a)
45 if err != nil {
46 err = fmt.Errorf("remote peer address not a multiaddr: %s", err)
47 - log.Error("Handshake3: error %s", err)
47 + log.Errorf("Handshake3: error %s", err)
48 return err
49 }
50 remotePeer.AddAddress(addr)
net/mux/mux.go
+4 -4
@@ -156,21 +156,21 @@ func (m *Muxer) handleIncomingMessage(m1 msg.NetMessage) {
156
157 data, pid, err := unwrapData(m1.Data())
158 if err != nil {
159 - log.Error("muxer de-serializing error: %v", err)
159 + log.Errorf("muxer de-serializing error: %v", err)
160 return
161 }
162
163 m2 := msg.New(m1.Peer(), data)
164 proto, found := m.Protocols[pid]
165 if !found {
166 - log.Error("muxer unknown protocol %v", pid)
166 + log.Errorf("muxer unknown protocol %v", pid)
167 return
168 }
169
170 select {
171 case proto.GetPipe().Incoming <- m2:
172 case <-m.ctx.Done():
173 - log.Error("%s", m.ctx.Err())
173 + log.Error(m.ctx.Err())
174 return
175 }
176 }
@@ -198,7 +198,7 @@ func (m *Muxer) handleOutgoingMessages(pid pb.ProtocolID, proto Protocol) {
198 func (m *Muxer) handleOutgoingMessage(pid pb.ProtocolID, m1 msg.NetMessage) {
199 data, err := wrapData(m1.Data(), pid)
200 if err != nil {
201 - log.Error("muxer serializing error: %v", err)
201 + log.Errorf("muxer serializing error: %v", err)
202 return
203 }
204
net/service/service.go
+5 -5
@@ -198,14 +198,14 @@ func (s *service) handleIncomingMessage(ctx context.Context, m msg.NetMessage) {
198 // unwrap the incoming message
199 data, rid, err := unwrapData(m.Data())
200 if err != nil {
201 - log.Error("de-serializing error: %v", err)
201 + log.Errorf("de-serializing error: %v", err)
202 }
203 m2 := msg.New(m.Peer(), data)
204
205 // if it's a request (or has no RequestID), handle it
206 if rid == nil || rid.IsRequest() {
207 if s.Handler == nil {
208 - log.Error("service dropped msg: %v", m)
208 + log.Errorf("service dropped msg: %v", m)
209 return // no handler, drop it.
210 }
211
@@ -216,7 +216,7 @@ func (s *service) handleIncomingMessage(ctx context.Context, m msg.NetMessage) {
216 if r1 != nil {
217 err := s.sendMessage(ctx, r1, rid.Response())
218 if err != nil {
219 - log.Error("error sending response message: %v", err)
219 + log.Errorf("error sending response message: %v", err)
220 }
221 }
222 return
@@ -224,7 +224,7 @@ func (s *service) handleIncomingMessage(ctx context.Context, m msg.NetMessage) {
224
225 // Otherwise, it is a response. handle it.
226 if !rid.IsResponse() {
227 - log.Error("RequestID should identify a response here.")
227 + log.Errorf("RequestID should identify a response here.")
228 }
229
230 key := RequestKey(m.Peer().ID(), RequestID(rid))
@@ -233,7 +233,7 @@ func (s *service) handleIncomingMessage(ctx context.Context, m msg.NetMessage) {
233 s.RequestsLock.RUnlock()
234
235 if !found {
236 - log.Error("no request key %v (timeout?)", []byte(key))
236 + log.Errorf("no request key %v (timeout?)", []byte(key))
237 return
238 }
239
net/swarm/conn.go
+10 -10
@@ -24,7 +24,7 @@ func (s *Swarm) listen() error {
24 if err != nil {
25 hasErr = true
26 retErr.Errors[i] = err
27 - log.Error("Failed to listen on: %s - %s", addr, err)
27 + log.Errorf("Failed to listen on: %s - %s", addr, err)
28 }
29 }
30
@@ -116,7 +116,7 @@ func (s *Swarm) connSetup(c conn.Conn) (conn.Conn, error) {
116 conns := []conn.Conn{c}
117 mc, err := conn.NewMultiConn(s.Context(), s.local, c.RemotePeer(), conns)
118 if err != nil {
119 - log.Error("error creating multiconn: %s", err)
119 + log.Errorf("error creating multiconn: %s", err)
120 c.Close()
121 return nil, err
122 }
@@ -126,15 +126,15 @@ func (s *Swarm) connSetup(c conn.Conn) (conn.Conn, error) {
126
127 // kick off reader goroutine
128 go s.fanInSingle(mc)
129 - log.Debug("added new multiconn: %s", mc)
129 + log.Debugf("added new multiconn: %s", mc)
130 } else {
131 s.connsLock.Unlock() // unlock before adding new conn
132
133 mc.Add(c)
134 - log.Debug("multiconn found: %s", mc)
134 + log.Debugf("multiconn found: %s", mc)
135 }
136
137 - log.Debug("multiconn added new conn %s", c)
137 + log.Debugf("multiconn added new conn %s", c)
138 return c, nil
139 }
140
@@ -151,7 +151,7 @@ func (s *Swarm) fanOut() {
151
152 case msg, ok := <-s.Outgoing:
153 if !ok {
154 - log.Info("%s outgoing channel closed", s)
154 + log.Infof("%s outgoing channel closed", s)
155 return
156 }
157
@@ -162,12 +162,12 @@ func (s *Swarm) fanOut() {
162 if !found {
163 e := fmt.Errorf("Sent msg to peer without open conn: %v", msg.Peer())
164 s.errChan <- e
165 - log.Error("%s", e)
165 + log.Error(e)
166 continue
167 }
168
169 i++
170 - log.Debug("%s sent message to %s (%d)", s.local, msg.Peer(), i)
170 + log.Debugf("%s sent message to %s (%d)", s.local, msg.Peer(), i)
171 // queue it in the connection's buffer
172 c.Out() <- msg.Data()
173 }
@@ -202,11 +202,11 @@ func (s *Swarm) fanInSingle(c conn.Conn) {
202
203 case data, ok := <-c.In():
204 if !ok {
205 - log.Info("%s in channel closed", c)
205 + log.Infof("%s in channel closed", c)
206 return // channel closed.
207 }
208 i++
209 - log.Debug("%s received message from %s (%d)", s.local, c.RemotePeer(), i)
209 + log.Debugf("%s received message from %s (%d)", s.local, c.RemotePeer(), i)
210 s.Incoming <- msg.New(c.RemotePeer(), data)
211 }
212 }
peer/peer.go
+2 -2
@@ -238,7 +238,7 @@ func (p *peer) VerifyAndSetPrivKey(sk ic.PrivKey) error {
238 // keys not equal. invariant violated. this warrants a panic.
239 // these keys should be _the same_ because peer.ID = H(pk)
240 // this mismatch should never happen.
241 - log.Error("%s had PrivKey: %v -- got %v", p, p.privKey, sk)
241 + log.Errorf("%s had PrivKey: %v -- got %v", p, p.privKey, sk)
242 panic("invariant violated: unexpected key mismatch")
243 }
244
@@ -270,7 +270,7 @@ func (p *peer) VerifyAndSetPubKey(pk ic.PubKey) error {
270 // keys not equal. invariant violated. this warrants a panic.
271 // these keys should be _the same_ because peer.ID = H(pk)
272 // this mismatch should never happen.
273 - log.Error("%s had PubKey: %v -- got %v", p, p.pubKey, pk)
273 + log.Errorf("%s had PubKey: %v -- got %v", p, p.pubKey, pk)
274 panic("invariant violated: unexpected key mismatch")
275 }
276
pin/pin_test.go
+1 -1
@@ -24,7 +24,7 @@ func TestPinnerBasic(t *testing.T) {
24 t.Fatal(err)
25 }
26
27 - dserv := &mdag.DAGService{bserv}
27 + dserv := &mdag.DAGService{Blocks: bserv}
28
29 p := NewPinner(dstore, dserv)
30
routing/dht/dht.go
+17 -17
@@ -84,7 +84,7 @@ func NewDHT(ctx context.Context, p peer.Peer, ps peer.Peerstore, dialer inet.Dia
84
85 // Connect to a new peer at the given address, ping and add to the routing table
86 func (dht *IpfsDHT) Connect(ctx context.Context, npeer peer.Peer) (peer.Peer, error) {
87 - log.Debug("Connect to new peer: %s", npeer)
87 + log.Debugf("Connect to new peer: %s", npeer)
88
89 // TODO(jbenet,whyrusleeping)
90 //
@@ -139,7 +139,7 @@ func (dht *IpfsDHT) HandleMessage(ctx context.Context, mes msg.NetMessage) msg.N
139 dht.Update(mPeer)
140
141 // Print out diagnostic
142 - log.Debug("[peer: %s] Got message type: '%s' [from = %s]\n",
142 + log.Debugf("%s got message type: '%s' from %s",
143 dht.self, Message_MessageType_name[int32(pmes.GetType())], mPeer)
144
145 // get handler for this msg type.
@@ -152,7 +152,7 @@ func (dht *IpfsDHT) HandleMessage(ctx context.Context, mes msg.NetMessage) msg.N
152 // dispatch handler.
153 rpmes, err := handler(mPeer, pmes)
154 if err != nil {
155 - log.Error("handle message error: %s", err)
155 + log.Errorf("handle message error: %s", err)
156 return nil
157 }
158
@@ -165,7 +165,7 @@ func (dht *IpfsDHT) HandleMessage(ctx context.Context, mes msg.NetMessage) msg.N
165 // serialize response msg
166 rmes, err := msg.FromObject(mPeer, rpmes)
167 if err != nil {
168 - log.Error("serialze response error: %s", err)
168 + log.Errorf("serialze response error: %s", err)
169 return nil
170 }
171
@@ -184,7 +184,7 @@ func (dht *IpfsDHT) sendRequest(ctx context.Context, p peer.Peer, pmes *Message)
184 start := time.Now()
185
186 // Print out diagnostic
187 - log.Debug("Sent message type: '%s' [to = %s]",
187 + log.Debugf("Sent message type: '%s' to %s",
188 Message_MessageType_name[int32(pmes.GetType())], p)
189
190 rmes, err := dht.sender.SendRequest(ctx, mes)
@@ -235,7 +235,7 @@ func (dht *IpfsDHT) putProvider(ctx context.Context, p peer.Peer, key string) er
235 return err
236 }
237
238 - log.Debug("%s putProvider: %s for %s", dht.self, p, key)
238 + log.Debugf("%s putProvider: %s for %s", dht.self, p, key)
239 if rpmes.GetKey() != pmes.GetKey() {
240 return errors.New("provider not added correctly")
241 }
@@ -251,7 +251,7 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.Peer,
251 return nil, nil, err
252 }
253
254 - log.Debug("pmes.GetValue() %v", pmes.GetValue())
254 + log.Debugf("pmes.GetValue() %v", pmes.GetValue())
255 if value := pmes.GetValue(); value != nil {
256 // Success! We were given the value
257 log.Debug("getValueOrPeers: got value")
@@ -273,7 +273,7 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.Peer,
273 for _, pb := range pmes.GetCloserPeers() {
274 pr, err := dht.peerFromInfo(pb)
275 if err != nil {
276 - log.Error("%s", err)
276 + log.Error(err)
277 continue
278 }
279 peers = append(peers, pr)
@@ -306,13 +306,13 @@ func (dht *IpfsDHT) getFromPeerList(ctx context.Context, key u.Key,
306 for _, pinfo := range peerlist {
307 p, err := dht.ensureConnectedToPeer(pinfo)
308 if err != nil {
309 - log.Error("getFromPeers error: %s", err)
309 + log.Errorf("getFromPeers error: %s", err)
310 continue
311 }
312
313 pmes, err := dht.getValueSingle(ctx, p, key, level)
314 if err != nil {
315 - log.Error("getFromPeers error: %s\n", err)
315 + log.Errorf("getFromPeers error: %s\n", err)
316 continue
317 }
318
@@ -349,7 +349,7 @@ func (dht *IpfsDHT) putLocal(key u.Key, value []byte) error {
349 // Update signals to all routingTables to Update their last-seen status
350 // on the given peer.
351 func (dht *IpfsDHT) Update(p peer.Peer) {
352 - log.Debug("updating peer: %s latency = %f\n", p, p.GetLatency().Seconds())
352 + log.Debugf("updating peer: %s latency = %f\n", p, p.GetLatency().Seconds())
353 removedCount := 0
354 for _, route := range dht.routingTables {
355 removed := route.Update(p)
@@ -394,11 +394,11 @@ func (dht *IpfsDHT) addProviders(key u.Key, peers []*Message_Peer) []peer.Peer {
394 for _, prov := range peers {
395 p, err := dht.peerFromInfo(prov)
396 if err != nil {
397 - log.Error("error getting peer from info: %v", err)
397 + log.Errorf("error getting peer from info: %v", err)
398 continue
399 }
400
401 - log.Debug("%s adding provider: %s for %s", dht.self, p, key)
401 + log.Debugf("%s adding provider: %s for %s", dht.self, p, key)
402
403 // Dont add outselves to the list
404 if p.ID().Equal(dht.self.ID()) {
@@ -456,7 +456,7 @@ func (dht *IpfsDHT) getPeer(id peer.ID) (peer.Peer, error) {
456 p, err := dht.peerstore.Get(id)
457 if err != nil {
458 err = fmt.Errorf("Failed to get peer from peerstore: %s", err)
459 - log.Error("%s", err)
459 + log.Error(err)
460 return nil, err
461 }
462 return p, nil
@@ -505,7 +505,7 @@ func (dht *IpfsDHT) loadProvidableKeys() error {
505 for _, dsk := range kl {
506 k := u.KeyFromDsKey(dsk)
507 if len(k) == 0 {
508 - log.Error("loadProvidableKeys error: %v", dsk)
508 + log.Errorf("loadProvidableKeys error: %v", dsk)
509 }
510
511 dht.providers.AddProvider(k, dht.self)
@@ -526,7 +526,7 @@ func (dht *IpfsDHT) PingRoutine(t time.Duration) {
526 ctx, _ := context.WithTimeout(dht.ctx, time.Second*5)
527 err := dht.Ping(ctx, p)
528 if err != nil {
529 - log.Error("Ping error: %s", err)
529 + log.Errorf("Ping error: %s", err)
530 }
531 }
532 case <-dht.ctx.Done():
@@ -541,6 +541,6 @@ func (dht *IpfsDHT) Bootstrap(ctx context.Context) {
541 rand.Read(id)
542 _, err := dht.FindPeer(ctx, peer.ID(id))
543 if err != nil {
544 - log.Error("Bootstrap peer error: %s", err)
544 + log.Errorf("Bootstrap peer error: %s", err)
545 }
546 }
routing/dht/dht_logger.go
+2 -2
@@ -30,14 +30,14 @@ func (l *logDhtRPC) EndLog() {
30 func (l *logDhtRPC) Print() {
31 b, err := json.Marshal(l)
32 if err != nil {
33 - log.Debug("Error marshaling logDhtRPC object: %s", err)
33 + log.Debugf("Error marshaling logDhtRPC object: %s", err)
34 } else {
35 log.Debug(string(b))
36 }
37 }
38
39 func (l *logDhtRPC) String() string {
40 - return fmt.Sprintf("DHT RPC: %s took %s, success = %s", l.Type, l.Duration, l.Success)
40 + return fmt.Sprintf("DHT RPC: %s took %s, success = %v", l.Type, l.Duration, l.Success)
41 }
42
43 func (l *logDhtRPC) EndAndPrint() {
routing/dht/handlers.go
+16 -16
@@ -36,7 +36,7 @@ func (dht *IpfsDHT) handlerForMsgType(t Message_MessageType) dhtHandler {
36 }
37
38 func (dht *IpfsDHT) handleGetValue(p peer.Peer, pmes *Message) (*Message, error) {
39 - log.Debug("%s handleGetValue for key: %s\n", dht.self, pmes.GetKey())
39 + log.Debugf("%s handleGetValue for key: %s\n", dht.self, pmes.GetKey())
40
41 // setup response
42 resp := newMessage(pmes.GetType(), pmes.GetKey(), pmes.GetClusterLevel())
@@ -48,10 +48,10 @@ func (dht *IpfsDHT) handleGetValue(p peer.Peer, pmes *Message) (*Message, error)
48 }
49
50 // let's first check if we have the value locally.
51 - log.Debug("%s handleGetValue looking into ds", dht.self)
51 + log.Debugf("%s handleGetValue looking into ds", dht.self)
52 dskey := u.Key(pmes.GetKey()).DsKey()
53 iVal, err := dht.datastore.Get(dskey)
54 - log.Debug("%s handleGetValue looking into ds GOT %v", dht.self, iVal)
54 + log.Debugf("%s handleGetValue looking into ds GOT %v", dht.self, iVal)
55
56 // if we got an unexpected error, bail.
57 if err != nil && err != ds.ErrNotFound {
@@ -63,7 +63,7 @@ func (dht *IpfsDHT) handleGetValue(p peer.Peer, pmes *Message) (*Message, error)
63
64 // if we have the value, send it back
65 if err == nil {
66 - log.Debug("%s handleGetValue success!", dht.self)
66 + log.Debugf("%s handleGetValue success!", dht.self)
67
68 byts, ok := iVal.([]byte)
69 if !ok {
@@ -76,7 +76,7 @@ func (dht *IpfsDHT) handleGetValue(p peer.Peer, pmes *Message) (*Message, error)
76 // if we know any providers for the requested value, return those.
77 provs := dht.providers.GetProviders(u.Key(pmes.GetKey()))
78 if len(provs) > 0 {
79 - log.Debug("handleGetValue returning %d provider[s]\n", len(provs))
79 + log.Debugf("handleGetValue returning %d provider[s]", len(provs))
80 resp.ProviderPeers = peersToPBPeers(provs)
81 }
82
@@ -84,7 +84,7 @@ func (dht *IpfsDHT) handleGetValue(p peer.Peer, pmes *Message) (*Message, error)
84 closer := dht.betterPeersToQuery(pmes, CloserPeerCount)
85 if closer != nil {
86 for _, p := range closer {
87 - log.Debug("handleGetValue returning closer peer: '%s'", p)
87 + log.Debugf("handleGetValue returning closer peer: '%s'", p)
88 if len(p.Addresses()) < 1 {
89 log.Critical("no addresses on peer being sent!")
90 }
@@ -101,12 +101,12 @@ func (dht *IpfsDHT) handlePutValue(p peer.Peer, pmes *Message) (*Message, error)
101 defer dht.dslock.Unlock()
102 dskey := u.Key(pmes.GetKey()).DsKey()
103 err := dht.datastore.Put(dskey, pmes.GetValue())
104 - log.Debug("%s handlePutValue %v %v\n", dht.self, dskey, pmes.GetValue())
104 + log.Debugf("%s handlePutValue %v %v\n", dht.self, dskey, pmes.GetValue())
105 return pmes, err
106 }
107
108 func (dht *IpfsDHT) handlePing(p peer.Peer, pmes *Message) (*Message, error) {
109 - log.Debug("%s Responding to ping from %s!\n", dht.self, p)
109 + log.Debugf("%s Responding to ping from %s!\n", dht.self, p)
110 return pmes, nil
111 }
112
@@ -122,7 +122,7 @@ func (dht *IpfsDHT) handleFindPeer(p peer.Peer, pmes *Message) (*Message, error)
122 }
123
124 if closest == nil {
125 - log.Error("handleFindPeer: could not find anything.")
125 + log.Errorf("handleFindPeer: could not find anything.")
126 return resp, nil
127 }
128
@@ -134,7 +134,7 @@ func (dht *IpfsDHT) handleFindPeer(p peer.Peer, pmes *Message) (*Message, error)
134 }
135
136 for _, p := range withAddresses {
137 - log.Debug("handleFindPeer: sending back '%s'", p)
137 + log.Debugf("handleFindPeer: sending back '%s'", p)
138 }
139 resp.CloserPeers = peersToPBPeers(withAddresses)
140 return resp, nil
@@ -144,11 +144,11 @@ func (dht *IpfsDHT) handleGetProviders(p peer.Peer, pmes *Message) (*Message, er
144 resp := newMessage(pmes.GetType(), pmes.GetKey(), pmes.GetClusterLevel())
145
146 // check if we have this value, to add ourselves as provider.
147 - log.Debug("handling GetProviders: '%s'", pmes.GetKey())
147 + log.Debugf("handling GetProviders: '%s'", pmes.GetKey())
148 dsk := u.Key(pmes.GetKey()).DsKey()
149 has, err := dht.datastore.Has(dsk)
150 if err != nil && err != ds.ErrNotFound {
151 - log.Error("unexpected datastore error: %v\n", err)
151 + log.Errorf("unexpected datastore error: %v\n", err)
152 has = false
153 }
154
@@ -180,7 +180,7 @@ type providerInfo struct {
180 func (dht *IpfsDHT) handleAddProvider(p peer.Peer, pmes *Message) (*Message, error) {
181 key := u.Key(pmes.GetKey())
182
183 - log.Debug("%s adding %s as a provider for '%s'\n", dht.self, p, peer.ID(key))
183 + log.Debugf("%s adding %s as a provider for '%s'\n", dht.self, p, peer.ID(key))
184
185 // add provider should use the address given in the message
186 for _, pb := range pmes.GetProviderPeers() {
@@ -189,16 +189,16 @@ func (dht *IpfsDHT) handleAddProvider(p peer.Peer, pmes *Message) (*Message, err
189
190 addr, err := pb.Address()
191 if err != nil {
192 - log.Error("provider %s error with address %s", p, *pb.Addr)
192 + log.Errorf("provider %s error with address %s", p, *pb.Addr)
193 continue
194 }
195
196 - log.Info("received provider %s %s for %s", p, addr, key)
196 + log.Infof("received provider %s %s for %s", p, addr, key)
197 p.AddAddress(addr)
198 dht.providers.AddProvider(key, p)
199
200 } else {
201 - log.Error("handleAddProvider received provider %s from %s", pid, p)
201 + log.Errorf("handleAddProvider received provider %s from %s", pid, p)
202 }
203 }
204
routing/dht/routing.go
+8 -8
@@ -17,7 +17,7 @@ import (
17 // PutValue adds value corresponding to given Key.
18 // This is the top level "Store" operation of the DHT
19 func (dht *IpfsDHT) PutValue(ctx context.Context, key u.Key, value []byte) error {
20 - log.Debug("PutValue %s", key)
20 + log.Debugf("PutValue %s", key)
21 err := dht.putLocal(key, value)
22 if err != nil {
23 return err
@@ -30,7 +30,7 @@ func (dht *IpfsDHT) PutValue(ctx context.Context, key u.Key, value []byte) error
30 }
31
32 query := newQuery(key, dht.dialer, func(ctx context.Context, p peer.Peer) (*dhtQueryResult, error) {
33 - log.Debug("%s PutValue qry part %v", dht.self, p)
33 + log.Debugf("%s PutValue qry part %v", dht.self, p)
34 err := dht.putValueToNetwork(ctx, p, string(key), value)
35 if err != nil {
36 return nil, err
@@ -46,7 +46,7 @@ func (dht *IpfsDHT) PutValue(ctx context.Context, key u.Key, value []byte) error
46 // If the search does not succeed, a multiaddr string of a closer peer is
47 // returned along with util.ErrSearchIncomplete
48 func (dht *IpfsDHT) GetValue(ctx context.Context, key u.Key) ([]byte, error) {
49 - log.Debug("Get Value [%s]", key)
49 + log.Debugf("Get Value [%s]", key)
50
51 // If we have it local, dont bother doing an RPC!
52 // NOTE: this might not be what we want to do...
@@ -86,7 +86,7 @@ func (dht *IpfsDHT) GetValue(ctx context.Context, key u.Key) ([]byte, error) {
86 return nil, err
87 }
88
89 - log.Debug("GetValue %v %v", key, result.value)
89 + log.Debugf("GetValue %v %v", key, result.value)
90 if result.value == nil {
91 return nil, u.ErrNotFound
92 }
@@ -140,7 +140,7 @@ func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key u.Key, count int
140 defer wg.Done()
141 pmes, err := dht.findProvidersSingle(ctx, p, key, 0)
142 if err != nil {
143 - log.Error("%s", err)
143 + log.Error(err)
144 return
145 }
146 dht.addPeerListAsync(key, pmes.GetProviderPeers(), ps, count, peerOut)
@@ -218,7 +218,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.Peer, error)
218 for _, pbp := range closer {
219 np, err := dht.getPeer(peer.ID(pbp.GetId()))
220 if err != nil {
221 - log.Warning("Received invalid peer from query")
221 + log.Warningf("Received invalid peer from query: %v", err)
222 continue
223 }
224 ma, err := pbp.Address()
@@ -256,10 +256,10 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.Peer, error)
256 // Ping a peer, log the time it took
257 func (dht *IpfsDHT) Ping(ctx context.Context, p peer.Peer) error {
258 // Thoughts: maybe this should accept an ID and do a peer lookup?
259 - log.Info("ping %s start", p)
259 + log.Infof("ping %s start", p)
260
261 pmes := newMessage(Message_PING, "", 0)
262 _, err := dht.sendRequest(ctx, p, pmes)
263 - log.Info("ping %s end (err = %s)", p, err)
263 + log.Infof("ping %s end (err = %s)", p, err)
264 return err
265 }
routing/kbucket/table.go
+2 -2
@@ -125,7 +125,7 @@ func copyPeersFromList(target ID, peerArr peerSorterArr, peerList *list.List) pe
125 }
126 peerArr = append(peerArr, &pd)
127 if e == nil {
128 - log.Debug("list element was nil.\n")
128 + log.Debug("list element was nil")
129 return peerArr
130 }
131 }
@@ -148,7 +148,7 @@ func (rt *RoutingTable) NearestPeer(id ID) peer.Peer {
148 return peers[0]
149 }
150
151 - log.Error("NearestPeer: Returning nil, table size = %d", rt.Size())
151 + log.Errorf("NearestPeer: Returning nil, table size = %d", rt.Size())
152 return nil
153 }
154
unixfs/io/dagmodifier.go
+3 -3
@@ -59,7 +59,7 @@ func (dm *DagModifier) WriteAt(b []byte, offset uint64) (int, error) {
59 origlen := len(b)
60
61 if end <= zeroblocklen {
62 - log.Debug("Writing into zero block.")
62 + log.Debug("Writing into zero block")
63 // Replacing zeroeth data block (embedded in the root node)
64 //TODO: check chunking here
65 copy(dm.pbdata.Data[offset:], b)
@@ -76,7 +76,7 @@ func (dm *DagModifier) WriteAt(b []byte, offset uint64) (int, error) {
76 traversed = uint64(zeroblocklen)
77 for i, size := range dm.pbdata.Blocksizes {
78 if uint64(offset) < traversed+size {
79 - log.Debug("Starting mod at block %d. [%d < %d + %d]", i, offset, traversed, size)
79 + log.Debugf("Starting mod at block %d. [%d < %d + %d]", i, offset, traversed, size)
80 // Here is where we start
81 startsubblk = i
82 lnk := dm.curNode.Links[i]
@@ -145,7 +145,7 @@ func (dm *DagModifier) WriteAt(b []byte, offset uint64) (int, error) {
145 n := &mdag.Node{Data: ft.WrapData(sb)}
146 _, err := dm.dagserv.Add(n)
147 if err != nil {
148 - log.Error("Failed adding node to DAG service: %s", err)
148 + log.Errorf("Failed adding node to DAG service: %s", err)
149 return 0, err
150 }
151 lnk, err := mdag.MakeLink(n)
unixfs/io/dagmodifier_test.go
+6 -6
@@ -22,11 +22,11 @@ func getMockDagServ(t *testing.T) *mdag.DAGService {
22 if err != nil {
23 t.Fatal(err)
24 }
25 - return &mdag.DAGService{bserv}
25 + return &mdag.DAGService{Blocks: bserv}
26 }
27
28 func getNode(t *testing.T, dserv *mdag.DAGService, size int64) ([]byte, *mdag.Node) {
29 - dw := NewDagWriter(dserv, &chunk.SizeSplitter{500})
29 + dw := NewDagWriter(dserv, &chunk.SizeSplitter{Size: 500})
30
31 n, err := io.CopyN(dw, u.NewFastRand(), size)
32 if err != nil {
@@ -99,7 +99,7 @@ func TestDagModifierBasic(t *testing.T) {
99 dserv := getMockDagServ(t)
100 b, n := getNode(t, dserv, 50000)
101
102 - dagmod, err := NewDagModifier(n, dserv, &chunk.SizeSplitter{512})
102 + dagmod, err := NewDagModifier(n, dserv, &chunk.SizeSplitter{Size: 512})
103 if err != nil {
104 t.Fatal(err)
105 }
@@ -142,7 +142,7 @@ func TestDagModifierBasic(t *testing.T) {
142
143 expected := uint64(50000 + 3500 + 3000)
144 if size != expected {
145 - t.Fatal("Final reported size is incorrect [%d != %d]", size, expected)
145 + t.Fatalf("Final reported size is incorrect [%d != %d]", size, expected)
146 }
147 }
148
@@ -150,7 +150,7 @@ func TestMultiWrite(t *testing.T) {
150 dserv := getMockDagServ(t)
151 _, n := getNode(t, dserv, 0)
152
153 - dagmod, err := NewDagModifier(n, dserv, &chunk.SizeSplitter{512})
153 + dagmod, err := NewDagModifier(n, dserv, &chunk.SizeSplitter{Size: 512})
154 if err != nil {
155 t.Fatal(err)
156 }
@@ -191,7 +191,7 @@ func TestMultiWriteCoal(t *testing.T) {
191 dserv := getMockDagServ(t)
192 _, n := getNode(t, dserv, 0)
193
194 - dagmod, err := NewDagModifier(n, dserv, &chunk.SizeSplitter{512})
194 + dagmod, err := NewDagModifier(n, dserv, &chunk.SizeSplitter{Size: 512})
195 if err != nil {
196 t.Fatal(err)
197 }
unixfs/io/dagwriter_test.go
+6 -6
@@ -53,8 +53,8 @@ func TestDagWriter(t *testing.T) {
53 if err != nil {
54 t.Fatal(err)
55 }
56 - dag := &mdag.DAGService{bserv}
57 - dw := NewDagWriter(dag, &chunk.SizeSplitter{4096})
56 + dag := &mdag.DAGService{Blocks: bserv}
57 + dw := NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
58
59 nbytes := int64(1024 * 1024 * 2)
60 n, err := io.CopyN(dw, &datasource{}, nbytes)
@@ -87,8 +87,8 @@ func TestMassiveWrite(t *testing.T) {
87 if err != nil {
88 t.Fatal(err)
89 }
90 - dag := &mdag.DAGService{bserv}
91 - dw := NewDagWriter(dag, &chunk.SizeSplitter{4096})
90 + dag := &mdag.DAGService{Blocks: bserv}
91 + dw := NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
92
93 nbytes := int64(1024 * 1024 * 1024 * 16)
94 n, err := io.CopyN(dw, &datasource{}, nbytes)
@@ -107,13 +107,13 @@ func BenchmarkDagWriter(b *testing.B) {
107 if err != nil {
108 b.Fatal(err)
109 }
110 - dag := &mdag.DAGService{bserv}
110 + dag := &mdag.DAGService{Blocks: bserv}
111
112 b.ResetTimer()
113 nbytes := int64(100000)
114 for i := 0; i < b.N; i++ {
115 b.SetBytes(nbytes)
116 - dw := NewDagWriter(dag, &chunk.SizeSplitter{4096})
116 + dw := NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
117 n, err := io.CopyN(dw, &datasource{}, nbytes)
118 if err != nil {
119 b.Fatal(err)
updates/updates.go
+6 -6
@@ -85,10 +85,10 @@ func init() {
85 var err error
86 currentVersion, err = parseVersion()
87 if err != nil {
88 - log.Error("invalid version number in code (must be semver): %q\n", Version)
88 + log.Errorf("invalid version number in code (must be semver): %q", Version)
89 os.Exit(1)
90 }
91 - log.Info("go-ipfs Version: %s", currentVersion)
91 + log.Infof("go-ipfs Version: %s", currentVersion)
92 }
93
94 func parseVersion() (*semver.Version, error) {
@@ -138,7 +138,7 @@ func ShouldAutoUpdate(setting config.AutoUpdateSetting, newVer string) bool {
138
139 nv, err := semver.NewVersion(newVer)
140 if err != nil {
141 - log.Error("could not parse version string: %s", err)
141 + log.Errorf("could not parse version string: %s", err)
142 return false
143 }
144
@@ -189,7 +189,7 @@ func CliCheckForUpdates(cfg *config.Config, confFile string) error {
189 u, err := CheckForUpdate()
190 // if there is no update available, record it, and exit.
191 if err == check.NoUpdateAvailable {
192 - log.Notice("No update available, checked on %s", time.Now())
192 + log.Noticef("No update available, checked on %s", time.Now())
193 config.RecordUpdateCheck(cfg, confFile) // only record if we checked successfully.
194 return nil
195 }
@@ -197,7 +197,7 @@ func CliCheckForUpdates(cfg *config.Config, confFile string) error {
197 // if another, unexpected error occurred, note it.
198 if err != nil {
199 if cfg.Version.Check == config.CheckError {
200 - log.Error("Error while checking for update: %v\n", err)
200 + log.Errorf("Error while checking for update: %v", err)
201 return nil
202 }
203 // when "warn" version.check mode we just show a warning message
@@ -211,7 +211,7 @@ func CliCheckForUpdates(cfg *config.Config, confFile string) error {
211 if cfg.Version.AutoUpdate != config.UpdateNever {
212 // and we should auto update
213 if ShouldAutoUpdate(cfg.Version.AutoUpdate, u.Version) {
214 - log.Notice("Applying update %s", u.Version)
214 + log.Noticef("Applying update %s", u.Version)
215
216 if err = Apply(u); err != nil {
217 log.Error(err.Error())
util/log.go
+2 -2
@@ -55,7 +55,7 @@ func SetupLogging() {
55 var err error
56 lvl, err = logging.LogLevel(logenv)
57 if err != nil {
58 - log.Error("logging.LogLevel() Error: %q", err)
58 + log.Errorf("logging.LogLevel() Error: %q", err)
59 lvl = logging.ERROR // reset to ERROR, could be undefined now(?)
60 }
61 }
@@ -74,7 +74,7 @@ func SetAllLoggers(lvl logging.Level) {
74 logging.SetLevel(lvl, "")
75 for n, log := range loggers {
76 logging.SetLevel(lvl, n)
77 - log.Notice("setting logger: %q to %v", n, lvl)
77 + log.Noticef("setting logger: %q to %v", n, lvl)
78 }
79 }
80
util/util.go
-2
@@ -119,8 +119,6 @@ func (r *randGen) Read(p []byte) (n int, err error) {
119 val >>= 8
120 }
121 }
122 -
123 - panic("unreachable")
122 }
123
124 // GetenvBool is the way to check an env var as a boolean