@cryptotaxi247 / kubo / commits / 58f39687c

logs: removed all log.Errors unhelpful to users

Let's save log.Error for things the user can take action on. Moved all our diagnostics to log.Debug. We can ideally reduce them even further.

Juan Batiz-Benet committed Feb 3, 2015 at 01:06 UTC 58f39687cfcb5dc3063ba4d9043ea597cbb9bf05
29 files changed +81 -117
blocks/set/dbset.go
+1 -1
@@ -22,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 {
25 - log.Errorf("blockset put error: %s", err)
25 + log.Debugf("blockset put error: %s", err)
26 }
27
28 d.bset.AddBlock(k)
blockservice/blockservice.go
+1 -1
@@ -122,7 +122,7 @@ func (s *BlockService) GetBlocks(ctx context.Context, ks []u.Key) <-chan *blocks
122
123 rblocks, err := s.Exchange.GetBlocks(ctx, misses)
124 if err != nil {
125 - log.Errorf("Error with GetBlocks: %s", err)
125 + log.Debugf("Error with GetBlocks: %s", err)
126 return
127 }
128
cmd/ipfs/main.go
+3 -3
@@ -483,20 +483,20 @@ func (i *cmdInvocation) setupInterruptHandler() {
483 n, err := ctx.GetNode()
484 if err != nil {
485 log.Error(err)
486 - log.Critical("Received interrupt signal, terminating...")
486 + fmt.Println("Received interrupt signal, terminating...")
487 os.Exit(-1)
488 }
489
490 switch count {
491 case 0:
492 - log.Critical("Received interrupt signal, shutting down...")
492 + fmt.Println("Received interrupt signal, shutting down...")
493 go func() {
494 n.Close()
495 log.Info("Gracefully shut down.")
496 }()
497
498 default:
499 - log.Critical("Received another interrupt before graceful shutdown, terminating...")
499 + fmt.Println("Received another interrupt before graceful shutdown, terminating...")
500 os.Exit(-1)
501 }
502 }
commands/http/handler.go
+1 -1
@@ -129,7 +129,7 @@ func (i Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
129 // w.WriteHeader(200)
130 err = copyChunks(applicationJson, w, out)
131 if err != nil {
132 - log.Error(err)
132 + log.Debug(err)
133 }
134 return
135 }
core/commands/ping.go
+1 -1
@@ -150,7 +150,7 @@ func pingPeer(ctx context.Context, n *core.IpfsNode, pid peer.ID, numPings int)
150 ctx, _ := context.WithTimeout(ctx, kPingTimeout)
151 took, err := n.Routing.Ping(ctx, pid)
152 if err != nil {
153 - log.Errorf("Ping error: %s", err)
153 + log.Debugf("Ping error: %s", err)
154 outChan <- &PingResult{Text: fmt.Sprintf("Ping error: %s", err)}
155 break
156 }
core/commands/refs.go
-2
@@ -110,7 +110,6 @@ Note: list all refs recursively with -r.
110
111 for _, o := range objs {
112 if _, err := rw.WriteRefs(o); err != nil {
113 - log.Error(err)
113 eptr.SetError(err)
114 return
115 }
@@ -153,7 +152,6 @@ Displays the hashes of all local objects.
152 for k := range allKeys {
153 s := k.Pretty() + "\n"
154 if _, err := pipew.Write([]byte(s)); err != nil {
156 - log.Error(err)
155 eptr.SetError(err)
156 return
157 }
core/commands/swarm.go
+1 -1
@@ -240,7 +240,7 @@ ipfs swarm disconnect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQA
240 conns := n.PeerHost.Network().ConnsToPeer(addr.ID())
241 for _, conn := range conns {
242 if !conn.RemoteMultiaddr().Equal(taddr) {
243 - log.Error("it's not", conn.RemoteMultiaddr(), taddr)
243 + log.Debug("it's not", conn.RemoteMultiaddr(), taddr)
244 continue
245 }
246
core/corehttp/gateway_handler.go
+5 -6
@@ -155,7 +155,7 @@ func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
155 errmsg = errmsg + "bad request for " + r.URL.Path
156 }
157 w.Write([]byte(errmsg))
158 - log.Error(errmsg)
158 + log.Debug(errmsg)
159 }
160
161 func (i *gatewayHandler) getHandler(w http.ResponseWriter, r *http.Request) {
@@ -174,7 +174,6 @@ func (i *gatewayHandler) getHandler(w http.ResponseWriter, r *http.Request) {
174 w.WriteHeader(http.StatusBadRequest)
175 }
176
177 - log.Error(err)
177 w.Write([]byte(err.Error()))
178 return
179 }
@@ -290,7 +289,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
289 urlPath := r.URL.Path
290 pathext := urlPath[5:]
291 var err error
293 - if urlPath == IpfsPathPrefix + "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn/" {
292 + if urlPath == IpfsPathPrefix+"QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn/" {
293 i.putEmptyDirHandler(w, r)
294 return
295 }
@@ -326,7 +325,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
325 err = fmt.Errorf("Cannot override existing object")
326 w.WriteHeader(http.StatusBadRequest)
327 w.Write([]byte(err.Error()))
329 - log.Error("%s", err)
328 + log.Debug("%s", err)
329 return
330 }
331
@@ -450,7 +449,7 @@ func webError(w http.ResponseWriter, message string, err error, defaultCode int)
449
450 func webErrorWithCode(w http.ResponseWriter, message string, err error, code int) {
451 w.WriteHeader(code)
453 - log.Errorf("%s: %s", message, err)
452 + log.Debugf("%s: %s", message, err)
453 w.Write([]byte(message + ": " + err.Error()))
454 }
455
@@ -458,7 +457,7 @@ func webErrorWithCode(w http.ResponseWriter, message string, err error, code int
457 func internalWebError(w http.ResponseWriter, err error) {
458 w.WriteHeader(http.StatusInternalServerError)
459 w.Write([]byte(err.Error()))
461 - log.Error("%s", err)
460 + log.Debug("%s", err)
461 }
462
463 // Directory listing template
core/corerepo/gc.go
+1 -1
@@ -51,7 +51,7 @@ func GarbageCollectAsync(n *core.IpfsNode, ctx context.Context) (<-chan *KeyRemo
51 if !n.Pinning.IsPinned(k) {
52 err := n.Blockstore.DeleteBlock(k)
53 if err != nil {
54 - log.Errorf("Error removing key from blockstore: %s", err)
54 + log.Debugf("Error removing key from blockstore: %s", err)
55 continue
56 }
57 select {
diagnostics/diag.go
+8 -8
@@ -187,7 +187,7 @@ func (d *Diagnostics) getDiagnosticFromPeers(ctx context.Context, peers map[peer
187 defer wg.Done()
188 out, err := d.getDiagnosticFromPeer(ctx, p, pmes)
189 if err != nil {
190 - log.Errorf("Error getting diagnostic from %s: %s", p, err)
190 + log.Debugf("Error getting diagnostic from %s: %s", p, err)
191 return
192 }
193 for d := range out {
@@ -234,17 +234,17 @@ func (d *Diagnostics) getDiagnosticFromPeer(ctx context.Context, p peer.ID, pmes
234 for {
235 rpmes := new(pb.Message)
236 if err := r.ReadMsg(rpmes); err != nil {
237 - log.Errorf("Error reading diagnostic from stream: %s", err)
237 + log.Debugf("Error reading diagnostic from stream: %s", err)
238 return
239 }
240 if rpmes == nil {
241 - log.Error("Got no response back from diag request.")
241 + log.Debug("Got no response back from diag request.")
242 return
243 }
244
245 di, err := decodeDiagJson(rpmes.GetData())
246 if err != nil {
247 - log.Error(err)
247 + log.Debug(err)
248 return
249 }
250
@@ -276,7 +276,7 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
276 // deserialize msg
277 pmes := new(pb.Message)
278 if err := r.ReadMsg(pmes); err != nil {
279 - log.Errorf("Failed to decode protobuf message: %v", err)
279 + log.Debugf("Failed to decode protobuf message: %v", err)
280 return nil
281 }
282
@@ -292,7 +292,7 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
292 resp := newMessage(pmes.GetDiagID())
293 resp.Data = d.getDiagInfo().Marshal()
294 if err := w.WriteMsg(resp); err != nil {
295 - log.Errorf("Failed to write protobuf message over stream: %s", err)
295 + log.Debugf("Failed to write protobuf message over stream: %s", err)
296 return err
297 }
298
@@ -305,14 +305,14 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
305
306 dpeers, err := d.getDiagnosticFromPeers(ctx, d.getPeers(), pmes)
307 if err != nil {
308 - log.Errorf("diagnostic from peers err: %s", err)
308 + log.Debugf("diagnostic from peers err: %s", err)
309 return err
310 }
311 for b := range dpeers {
312 resp := newMessage(pmes.GetDiagID())
313 resp.Data = b.Marshal()
314 if err := w.WriteMsg(resp); err != nil {
315 - log.Errorf("Failed to write protobuf message over stream: %s", err)
315 + log.Debugf("Failed to write protobuf message over stream: %s", err)
316 return err
317 }
318 }
exchange/bitswap/bitswap.go
+9 -9
@@ -211,7 +211,7 @@ func (bs *bitswap) sendWantlistMsgToPeers(ctx context.Context, m bsmsg.BitSwapMe
211 go func(p peer.ID) {
212 defer wg.Done()
213 if err := bs.send(ctx, p, m); err != nil {
214 - log.Error(err) // TODO remove if too verbose
214 + log.Debug(err) // TODO remove if too verbose
215 }
216 }(peerToQuery)
217 }
@@ -258,7 +258,7 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context, entries []wantli
258
259 err := bs.sendWantlistToPeers(ctx, sendToPeers)
260 if err != nil {
261 - log.Errorf("sendWantlistToPeers error: %s", err)
261 + log.Debugf("sendWantlistToPeers error: %s", err)
262 }
263 }
264
@@ -268,12 +268,12 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
268 defer log.EventBegin(ctx, "receiveMessage", p, incoming).Done()
269
270 if p == "" {
271 - log.Error("Received message from nil peer!")
271 + log.Debug("Received message from nil peer!")
272 // TODO propagate the error upward
273 return "", nil
274 }
275 if incoming == nil {
276 - log.Error("Got nil bitswap message!")
276 + log.Debug("Got nil bitswap message!")
277 // TODO propagate the error upward
278 return "", nil
279 }
@@ -287,7 +287,7 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
287 for _, block := range incoming.Blocks() {
288 hasBlockCtx, _ := context.WithTimeout(ctx, hasBlockTimeout)
289 if err := bs.HasBlock(hasBlockCtx, block); err != nil {
290 - log.Error(err)
290 + log.Debug(err)
291 }
292 }
293 var keys []u.Key
@@ -308,7 +308,7 @@ func (bs *bitswap) PeerConnected(p peer.ID) {
308 close(peers)
309 err := bs.sendWantlistToPeers(context.TODO(), peers)
310 if err != nil {
311 - log.Errorf("error sending wantlist: %s", err)
311 + log.Debugf("error sending wantlist: %s", err)
312 }
313 }
314
@@ -329,13 +329,13 @@ func (bs *bitswap) cancelBlocks(ctx context.Context, bkeys []u.Key) {
329 for _, p := range bs.engine.Peers() {
330 err := bs.send(ctx, p, message)
331 if err != nil {
332 - log.Errorf("Error sending message: %s", err)
332 + log.Debugf("Error sending message: %s", err)
333 }
334 }
335 }
336
337 func (bs *bitswap) ReceiveError(err error) {
338 - log.Errorf("Bitswap ReceiveError: %s", err)
338 + log.Debugf("Bitswap ReceiveError: %s", err)
339 // TODO log the network error
340 // TODO bubble the network error up to the parent context/error logger
341 }
@@ -413,7 +413,7 @@ func (bs *bitswap) clientWorker(parent context.Context) {
413 providers := bs.network.FindProvidersAsync(child, keys[0], maxProvidersPerRequest)
414 err := bs.sendWantlistToPeers(ctx, providers)
415 if err != nil {
416 - log.Errorf("error sending wantlist: %s", err)
416 + log.Debugf("error sending wantlist: %s", err)
417 }
418 case <-parent.Done():
419 return
exchange/bitswap/network/ipfs_impl.go
+4 -4
@@ -62,7 +62,7 @@ func (bsnet *impl) SendMessage(
62 defer s.Close()
63
64 if err := outgoing.ToNet(s); err != nil {
65 - log.Errorf("error: %s", err)
65 + log.Debugf("error: %s", err)
66 return err
67 }
68
@@ -81,13 +81,13 @@ func (bsnet *impl) SendRequest(
81 defer s.Close()
82
83 if err := outgoing.ToNet(s); err != nil {
84 - log.Errorf("error: %s", err)
84 + log.Debugf("error: %s", err)
85 return nil, err
86 }
87
88 incoming, err := bsmsg.FromNet(s)
89 if err != nil {
90 - log.Errorf("error: %s", err)
90 + log.Debugf("error: %s", err)
91 return incoming, err
92 }
93
@@ -150,7 +150,7 @@ func (bsnet *impl) handleNewStream(s inet.Stream) {
150 received, err := bsmsg.FromNet(s)
151 if err != nil {
152 go bsnet.receiver.ReceiveError(err)
153 - log.Errorf("bitswap net handleNewStream from %s error: %s", s.Conn().RemotePeer(), err)
153 + log.Debugf("bitswap net handleNewStream from %s error: %s", s.Conn().RemotePeer(), err)
154 return
155 }
156
exchange/reprovide/reprovide.go
+3 -3
@@ -41,7 +41,7 @@ func (rp *Reprovider) ProvideEvery(ctx context.Context, tick time.Duration) {
41 case <-after:
42 err := rp.Reprovide(ctx)
43 if err != nil {
44 - log.Error(err)
44 + log.Debug(err)
45 }
46 after = time.After(tick)
47 }
@@ -57,7 +57,7 @@ func (rp *Reprovider) Reprovide(ctx context.Context) error {
57 op := func() error {
58 err := rp.rsys.Provide(ctx, k)
59 if err != nil {
60 - log.Warningf("Failed to provide key: %s", err)
60 + log.Debugf("Failed to provide key: %s", err)
61 }
62 return err
63 }
@@ -66,7 +66,7 @@ func (rp *Reprovider) Reprovide(ctx context.Context) error {
66 // eventually work contexts into it. low priority.
67 err := backoff.Retry(op, backoff.NewExponentialBackOff())
68 if err != nil {
69 - log.Errorf("Providing failed after number of retries: %s", err)
69 + log.Debugf("Providing failed after number of retries: %s", err)
70 return err
71 }
72 }
fuse/ipns/ipns_unix.go
+9 -36
@@ -99,7 +99,6 @@ func CreateRoot(n *core.IpfsNode, keys []ci.PrivKey, ipfsroot string) (*Root, er
99 pub := k.GetPublic()
100 hash, err := pub.Hash()
101 if err != nil {
102 - log.Errorf("Read Root Error: %s", err)
102 return nil, err
103 }
104 root.LocalLink = &Link{u.Key(hash).Pretty()}
@@ -108,7 +107,7 @@ func CreateRoot(n *core.IpfsNode, keys []ci.PrivKey, ipfsroot string) (*Root, er
107 for _, k := range keys {
108 hash, err := k.GetPublic().Hash()
109 if err != nil {
111 - log.Error("failed to hash public key.")
110 + log.Debug("failed to hash public key.")
111 continue
112 }
113 name := u.Key(hash).Pretty()
@@ -169,7 +168,6 @@ func (*Root) Attr() fuse.Attr {
168
169 // Lookup performs a lookup under this node.
170 func (s *Root) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
172 - log.Debugf("ipns: Root Lookup: '%s'", name)
171 switch name {
172 case "mach_kernel", ".hidden", "._.":
173 // Just quiet some log noise on OS X.
@@ -188,7 +186,6 @@ func (s *Root) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
186 return nd, nil
187 }
188
191 - log.Debugf("ipns: Falling back to resolution for [%s].", name)
189 resolved, err := s.Ipfs.Namesys.Resolve(s.Ipfs.Context(), name)
190 if err != nil {
191 log.Warningf("ipns: namesys resolve error: %s", err)
@@ -200,7 +197,6 @@ func (s *Root) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
197
198 // ReadDir reads a particular directory. Disallowed for root.
199 func (r *Root) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) {
203 - log.Debug("Read Root.")
200 listing := []fuse.Dirent{
201 fuse.Dirent{
202 Name: "local",
@@ -211,7 +207,6 @@ func (r *Root) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) {
207 pub := k.GetPublic()
208 hash, err := pub.Hash()
209 if err != nil {
214 - log.Errorf("Read Root Error: %s", err)
210 continue
211 }
212 ent := fuse.Dirent{
@@ -257,7 +252,7 @@ func (s *Node) Attr() fuse.Attr {
252 if s.cached == nil {
253 err := s.loadData()
254 if err != nil {
260 - log.Errorf("Error loading PBData for file: '%s'", s.name)
255 + log.Debugf("Error loading PBData for file: '%s'", s.name)
256 }
257 }
258 switch s.cached.GetType() {
@@ -266,7 +261,7 @@ func (s *Node) Attr() fuse.Attr {
261 case ftpb.Data_File, ftpb.Data_Raw:
262 size, err := ft.DataSize(s.Nd.Data)
263 if err != nil {
269 - log.Errorf("Error getting size of file: %s", err)
264 + log.Debugf("Error getting size of file: %s", err)
265 size = 0
266 }
267 if size == 0 {
@@ -284,14 +279,13 @@ func (s *Node) Attr() fuse.Attr {
279 Blocks: uint64(len(s.Nd.Links)),
280 }
281 default:
287 - log.Error("Invalid data type.")
282 + log.Debug("Invalid data type.")
283 return fuse.Attr{}
284 }
285 }
286
287 // Lookup performs a lookup under this node.
288 func (s *Node) Lookup(name string, intr fs.Intr) (fs.Node, fuse.Error) {
294 - log.Debugf("ipns: node[%s] Lookup '%s'", s.name, name)
289 nodes, err := s.Ipfs.Resolver.ResolveLinks(s.Nd, []string{name})
290 if err != nil {
291 // todo: make this error more versatile.
@@ -322,7 +316,6 @@ func (n *Node) makeChild(name string, node *mdag.Node) *Node {
316
317 // ReadDir reads the link structure as directory entries
318 func (s *Node) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) {
325 - log.Debug("Node ReadDir")
319 entries := make([]fuse.Dirent, len(s.Nd.Links))
320 for i, link := range s.Nd.Links {
321 n := link.Name
@@ -381,9 +374,9 @@ func (s *Node) Read(req *fuse.ReadRequest, resp *fuse.ReadResponse, intr fs.Intr
374 }
375
376 func (n *Node) Write(req *fuse.WriteRequest, resp *fuse.WriteResponse, intr fs.Intr) fuse.Error {
384 - log.Debugf("ipns: Node Write [%s]: flags = %s, offset = %d, size = %d", n.name, req.Flags.String(), req.Offset, len(req.Data))
377 + // log.Debugf("ipns: Node Write [%s]: flags = %s, offset = %d, size = %d", n.name, req.Flags.String(), req.Offset, len(req.Data))
378 if IpnsReadonly {
386 - log.Error("Attempted to write on readonly ipns filesystem.")
379 + log.Debug("Attempted to write on readonly ipns filesystem.")
380 return fuse.EPERM
381 }
382
@@ -391,7 +384,6 @@ func (n *Node) Write(req *fuse.WriteRequest, resp *fuse.WriteResponse, intr fs.I
384 // Create a DagModifier to allow us to change the existing dag node
385 dmod, err := uio.NewDagModifier(n.Nd, n.Ipfs.DAG, chunk.DefaultSplitter)
386 if err != nil {
394 - log.Errorf("Error creating dag modifier: %s", err)
387 return err
388 }
389 n.dagMod = dmod
@@ -405,7 +397,6 @@ func (n *Node) Write(req *fuse.WriteRequest, resp *fuse.WriteResponse, intr fs.I
397 }
398
399 func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
408 - log.Debugf("Got flush request [%s]!", n.name)
400 if IpnsReadonly {
401 return nil
402 }
@@ -414,12 +405,11 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
405 if n.dagMod != nil {
406 newNode, err := n.dagMod.GetNode()
407 if err != nil {
417 - log.Errorf("Error getting dag node from dagMod: %s", err)
408 return err
409 }
410
411 if n.parent != nil {
422 - log.Debug("updating self in parent!")
412 + log.Error("updating self in parent!")
413 err := n.parent.update(n.name, newNode)
414 if err != nil {
415 log.Criticalf("error in updating ipns dag tree: %s", err)
@@ -465,7 +455,6 @@ func (n *Node) wasChanged() {
455 }
456
457 func (n *Node) republishRoot() error {
468 - log.Debug("Republish root")
458
459 // We should already be the root, this is just a sanity check
460 var root *Node
@@ -484,28 +473,22 @@ func (n *Node) republishRoot() error {
473
474 ndkey, err := root.Nd.Key()
475 if err != nil {
487 - log.Errorf("getKey error: %s", err)
476 return err
477 }
490 - log.Debug("Publishing changes!")
478
479 err = n.Ipfs.Namesys.Publish(n.Ipfs.Context(), root.key, ndkey)
480 if err != nil {
494 - log.Errorf("ipns: Publish Failed: %s", err)
481 return err
482 }
483 return nil
484 }
485
486 func (n *Node) Fsync(req *fuse.FsyncRequest, intr fs.Intr) fuse.Error {
501 - log.Debug("Got fsync request!")
487 return nil
488 }
489
490 func (n *Node) Mkdir(req *fuse.MkdirRequest, intr fs.Intr) (fs.Node, fuse.Error) {
506 - log.Debug("Got mkdir request!")
491 if IpnsReadonly {
508 - log.Error("Attempted to call mkdir on readonly filesystem.")
492 return nil, fuse.EPERM
493 }
494 dagnd := &mdag.Node{Data: ft.FolderPBData()}
@@ -552,14 +535,12 @@ func (n *Node) Open(req *fuse.OpenRequest, resp *fuse.OpenResponse, intr fs.Intr
535 }
536
537 func (n *Node) Mknod(req *fuse.MknodRequest, intr fs.Intr) (fs.Node, fuse.Error) {
555 - log.Debug("Got mknod request!")
538 return nil, nil
539 }
540
541 func (n *Node) Create(req *fuse.CreateRequest, resp *fuse.CreateResponse, intr fs.Intr) (fs.Node, fs.Handle, fuse.Error) {
560 - log.Debugf("Got create request: %s", req.Name)
542 if IpnsReadonly {
562 - log.Error("Attempted to call Create on a readonly filesystem.")
543 + log.Debug("Attempted to call Create on a readonly filesystem.")
544 return nil, nil, fuse.EPERM
545 }
546
@@ -571,7 +552,6 @@ func (n *Node) Create(req *fuse.CreateRequest, resp *fuse.CreateResponse, intr f
552
553 err := nnode.AddNodeLink(req.Name, nd)
554 if err != nil {
574 - log.Errorf("Error adding child to node: %s", err)
555 return nil, nil, err
556 }
557 if n.parent != nil {
@@ -589,16 +569,13 @@ func (n *Node) Create(req *fuse.CreateRequest, resp *fuse.CreateResponse, intr f
569 }
570
571 func (n *Node) Remove(req *fuse.RemoveRequest, intr fs.Intr) fuse.Error {
592 - log.Debugf("[%s] Got Remove request: %s", n.name, req.Name)
572 if IpnsReadonly {
594 - log.Error("Attempted to call Remove on a readonly filesystem.")
573 return fuse.EPERM
574 }
575
576 nnode := n.Nd.Copy()
577 err := nnode.RemoveNodeLink(req.Name)
578 if err != nil {
601 - log.Error("Remove: No such file.")
579 return fuse.ENOENT
580 }
581
@@ -615,9 +592,8 @@ func (n *Node) Remove(req *fuse.RemoveRequest, intr fs.Intr) fuse.Error {
592 }
593
594 func (n *Node) Rename(req *fuse.RenameRequest, newDir fs.Node, intr fs.Intr) fuse.Error {
618 - log.Debugf("Got Rename request '%s' -> '%s'", req.OldName, req.NewName)
595 if IpnsReadonly {
620 - log.Error("Attempted to call Rename on a readonly filesystem.")
596 + log.Debug("Attempted to call Rename on a readonly filesystem.")
597 return fuse.EPERM
598 }
599
@@ -637,7 +613,6 @@ func (n *Node) Rename(req *fuse.RenameRequest, newDir fs.Node, intr fs.Intr) fus
613 case *Node:
614 err := newDir.Nd.AddNodeLink(req.NewName, mdn)
615 if err != nil {
640 - log.Errorf("Error adding node to new dir on rename: %s", err)
616 return err
617 }
618 default:
@@ -649,8 +624,6 @@ func (n *Node) Rename(req *fuse.RenameRequest, newDir fs.Node, intr fs.Intr) fus
624
625 // Updates the child of this node, specified by name to the given newnode
626 func (n *Node) update(name string, newnode *mdag.Node) error {
652 - log.Debugf("update '%s' in '%s'", name, n.name)
653 -
627 nnode, err := n.Nd.UpdateNodeLink(name, newnode)
628 if err != nil {
629 return err
fuse/mount/mount.go
+2 -2
@@ -107,7 +107,7 @@ func (m *mount) unmount() error {
107 if err == nil {
108 return nil
109 }
110 - log.Error("fuse unmount err: %s", err)
110 + log.Debug("fuse unmount err: %s", err)
111
112 // try closing the fuseConn
113 err = m.fuseConn.Close()
@@ -115,7 +115,7 @@ func (m *mount) unmount() error {
115 return nil
116 }
117 if err != nil {
118 - log.Error("fuse conn error: %s", err)
118 + log.Debug("fuse conn error: %s", err)
119 }
120
121 // try mount.ForceUnmountManyTimes
fuse/readonly/readonly_unix.go
+1 -1
@@ -110,7 +110,7 @@ func (s *Node) Attr() fuse.Attr {
110 }
111
112 default:
113 - log.Error("Invalid data type.")
113 + log.Debug("Invalid data type.")
114 return fuse.Attr{}
115 }
116 }
importer/chunk/splitting.go
+1 -1
@@ -38,7 +38,7 @@ func (ss *SizeSplitter) Split(r io.Reader) chan []byte {
38 return
39 }
40 if err != nil {
41 - log.Errorf("Block split error: %s", err)
41 + log.Debugf("Block split error: %s", err)
42 return
43 }
44 }
merkledag/merkledag.go
+2 -2
@@ -136,7 +136,7 @@ func FetchGraph(ctx context.Context, root *Node, serv DAGService) chan struct{}
136
137 nd, err := lnk.GetNode(serv)
138 if err != nil {
139 - log.Error(err)
139 + log.Debug(err)
140 return
141 }
142
@@ -199,7 +199,7 @@ func (ds *dagService) GetNodes(ctx context.Context, keys []u.Key) []NodeGetter {
199 nd, err := Decoded(blk.Data)
200 if err != nil {
201 // NB: can happen with improperly formatted input data
202 - log.Error("Got back bad block!")
202 + log.Debug("Got back bad block!")
203 return
204 }
205 is := FindLinks(keys, blk.Key(), 0)
namesys/publisher.go
+1 -4
@@ -43,19 +43,16 @@ func (p *ipnsPublisher) Publish(ctx context.Context, k ci.PrivKey, value u.Key)
43 // validate `value` is a ref (multihash)
44 _, err := mh.FromB58String(value.Pretty())
45 if err != nil {
46 - log.Errorf("hash cast failed: %s", value)
46 return fmt.Errorf("publish value must be str multihash. %v", err)
47 }
48
49 data, err := createRoutingEntryData(k, value)
50 if err != nil {
52 - log.Error("entry creation failed.")
51 return err
52 }
53 pubkey := k.GetPublic()
54 pkbytes, err := pubkey.Bytes()
55 if err != nil {
58 - log.Error("pubkey getbytes failed.")
56 return err
57 }
58
@@ -120,7 +117,7 @@ func ValidateIpnsRecord(k u.Key, val []byte) error {
117 case pb.IpnsEntry_EOL:
118 t, err := u.ParseRFC3339(string(entry.GetValidity()))
119 if err != nil {
123 - log.Error("Failed parsing time for ipns record EOL")
120 + log.Debug("Failed parsing time for ipns record EOL")
121 return err
122 }
123 if time.Now().After(t) {
p2p/net/swarm/swarm_listen.go
+2 -2
@@ -33,7 +33,7 @@ func (s *Swarm) listen(addrs []ma.Multiaddr) error {
33 retErr.Errors = make([]error, len(addrs))
34 }
35 retErr.Errors[i] = err
36 - log.Errorf("Failed to listen on: %s - %s", addr, err)
36 + log.Debugf("Failed to listen on: %s - %s", addr, err)
37 }
38 }
39
@@ -122,7 +122,7 @@ func (s *Swarm) connHandler(c *ps.Conn) *Conn {
122
123 sc, err := s.newConnSetup(ctx, c)
124 if err != nil {
125 - log.Error(err)
125 + log.Debug(err)
126 log.Event(ctx, "newConnHandlerDisconnect", lgbl.NetConn(c.NetConn()), lgbl.Error(err))
127 c.Close() // boom. close it.
128 return nil
p2p/net/swarm/swarm_test.go
+4 -4
@@ -22,25 +22,25 @@ func EchoStreamHandler(stream inet.Stream) {
22
23 // pull out the ipfs conn
24 c := stream.Conn()
25 - log.Debugf("%s ponging to %s", c.LocalPeer(), c.RemotePeer())
25 + log.Infof("%s ponging to %s", c.LocalPeer(), c.RemotePeer())
26
27 buf := make([]byte, 4)
28
29 for {
30 if _, err := stream.Read(buf); err != nil {
31 if err != io.EOF {
32 - log.Error("ping receive error:", err)
32 + log.Info("ping receive error:", err)
33 }
34 return
35 }
36
37 if !bytes.Equal(buf, []byte("ping")) {
38 - log.Errorf("ping receive error: ping != %s %v", buf, buf)
38 + log.Infof("ping receive error: ping != %s %v", buf, buf)
39 return
40 }
41
42 if _, err := stream.Write([]byte("pong")); err != nil {
43 - log.Error("pond send error:", err)
43 + log.Info("pond send error:", err)
44 return
45 }
46 }
p2p/protocol/mux.go
+2 -5
@@ -24,9 +24,8 @@ type streamHandlerMap map[ID]inet.StreamHandler
24 // It contains the handlers for each protocol accepted.
25 // It dispatches handlers for streams opened by remote peers.
26 type Mux struct {
27 -
28 - lock sync.RWMutex
29 - handlers streamHandlerMap
27 + lock sync.RWMutex
28 + handlers streamHandlerMap
29 defaultHandler inet.StreamHandler
30 }
31
@@ -50,13 +49,11 @@ func (m *Mux) Protocols() []ID {
49 // readHeader reads the stream and returns the next Handler function
50 // according to the muxer encoding.
51 func (m *Mux) readHeader(s io.Reader) (ID, inet.StreamHandler, error) {
53 - // log.Error("ReadProtocolHeader")
52 p, err := ReadHeader(s)
53 if err != nil {
54 return "", nil, err
55 }
56
59 - // log.Debug("readHeader got:", p)
57 m.lock.RLock()
58 defer m.lock.RUnlock()
59 h, found := m.handlers[p]
p2p/test/backpressure/backpressure_test.go
+2 -2
@@ -66,9 +66,9 @@ a problem.
66 // our request handler. can do stuff here. we
67 // simulate something taking time by waiting
68 // on requestHandled
69 - log.Error("request worker handling...")
69 + log.Debug("request worker handling...")
70 <-requestHandled
71 - log.Error("request worker done!")
71 + log.Debug("request worker done!")
72 receiverRatelimit <- struct{}{} // release
73 }()
74 }
routing/dht/dht_test.go
+3 -3
@@ -262,7 +262,7 @@ func waitForWellFormedTables(t *testing.T, dhts []*IpfsDHT, minPeers, avgPeers i
262 for {
263 select {
264 case <-timeoutA:
265 - log.Errorf("did not reach well-formed routing tables by %s", timeout)
265 + log.Debugf("did not reach well-formed routing tables by %s", timeout)
266 return false // failed
267 case <-time.After(5 * time.Millisecond):
268 if checkTables() {
@@ -322,7 +322,7 @@ func TestBootstrap(t *testing.T) {
322 }
323 }()
324
325 - waitForWellFormedTables(t, dhts, 7, 10, 5*time.Second)
325 + waitForWellFormedTables(t, dhts, 7, 10, 20*time.Second)
326 close(stop)
327
328 if u.Debug {
@@ -407,7 +407,7 @@ func TestPeriodicBootstrap(t *testing.T) {
407
408 // this is async, and we dont know when it's finished with one cycle, so keep checking
409 // until the routing tables look better, or some long timeout for the failure case.
410 - waitForWellFormedTables(t, dhts, 7, 10, 5*time.Second)
410 + waitForWellFormedTables(t, dhts, 7, 10, 20*time.Second)
411
412 if u.Debug {
413 printRoutingTables(dhts)
routing/grandcentral/client.go
+2 -2
@@ -44,13 +44,13 @@ func (c *Client) FindProvidersAsync(ctx context.Context, k u.Key, max int) <-cha
44 request := pb.NewMessage(pb.Message_GET_PROVIDERS, string(k), 0)
45 response, err := c.proxy.SendRequest(ctx, request)
46 if err != nil {
47 - log.Error(errors.Wrap(err))
47 + log.Debug(errors.Wrap(err))
48 return
49 }
50 for _, p := range pb.PBPeersToPeerInfos(response.GetProviderPeers()) {
51 select {
52 case <-ctx.Done():
53 - log.Error(errors.Wrap(ctx.Err()))
53 + log.Debug(errors.Wrap(ctx.Err()))
54 return
55 case ch <- p:
56 }
routing/grandcentral/proxy/loopback.go
+2 -2
@@ -2,9 +2,9 @@ package proxy
2
3 import (
4 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5 + ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
6 inet "github.com/jbenet/go-ipfs/p2p/net"
7 peer "github.com/jbenet/go-ipfs/p2p/peer"
7 - ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
8 dhtpb "github.com/jbenet/go-ipfs/routing/dht/pb"
9 errors "github.com/jbenet/go-ipfs/util/debugerror"
10 )
@@ -39,7 +39,7 @@ func (lb *Loopback) handleNewStream(s inet.Stream) {
39 pbr := ggio.NewDelimitedReader(s, inet.MessageSizeMax)
40 var incoming dhtpb.Message
41 if err := pbr.ReadMsg(&incoming); err != nil {
42 - log.Error(errors.Wrap(err))
42 + log.Debug(errors.Wrap(err))
43 return
44 }
45 ctx := context.TODO()
routing/grandcentral/server.go
+7 -7
@@ -53,16 +53,16 @@ func (s *Server) handleMessage(
53 dskey := util.Key(req.GetKey()).DsKey()
54 val, err := s.datastore.Get(dskey)
55 if err != nil {
56 - log.Error(errors.Wrap(err))
56 + log.Debug(errors.Wrap(err))
57 return "", nil
58 }
59 rawRecord, ok := val.([]byte)
60 if !ok {
61 - log.Errorf("datastore had non byte-slice value for %v", dskey)
61 + log.Debugf("datastore had non byte-slice value for %v", dskey)
62 return "", nil
63 }
64 if err := proto.Unmarshal(rawRecord, response.Record); err != nil {
65 - log.Error("failed to unmarshal dht record from datastore")
65 + log.Debug("failed to unmarshal dht record from datastore")
66 return "", nil
67 }
68 // TODO before merging: if we know any providers for the requested value, return those.
@@ -72,12 +72,12 @@ func (s *Server) handleMessage(
72 // TODO before merging: verifyRecord(req.GetRecord())
73 data, err := proto.Marshal(req.GetRecord())
74 if err != nil {
75 - log.Error(err)
75 + log.Debug(err)
76 return "", nil
77 }
78 dskey := util.Key(req.GetKey()).DsKey()
79 if err := s.datastore.Put(dskey, data); err != nil {
80 - log.Error(err)
80 + log.Debug(err)
81 return "", nil
82 }
83 return p, req // TODO before merging: verify that we should return record
@@ -91,7 +91,7 @@ func (s *Server) handleMessage(
91 for _, provider := range req.GetProviderPeers() {
92 providerID := peer.ID(provider.GetId())
93 if providerID != p {
94 - log.Errorf("provider message came from third-party %s", p)
94 + log.Debugf("provider message came from third-party %s", p)
95 continue
96 }
97 for _, maddr := range provider.Addresses() {
@@ -107,7 +107,7 @@ func (s *Server) handleMessage(
107 }
108 }
109 if err := s.datastore.Put(pkey, providers); err != nil {
110 - log.Error(err)
110 + log.Debug(err)
111 return "", nil
112 }
113 return "", nil
tour/tour.go
+2 -2
@@ -72,8 +72,8 @@ func compareDottedInts(i, o string) bool {
72 ivis, err1 := strconv.Atoi(vis)
73 ivos, err2 := strconv.Atoi(vos)
74 if err1 != nil || err2 != nil {
75 - log.Error(err1)
76 - log.Error(err2)
75 + log.Debug(err1)
76 + log.Debug(err2)
77 panic("tour ID LessThan: not an int")
78 }
79
updates/updates.go
+1 -1
@@ -90,7 +90,7 @@ func init() {
90 var err error
91 currentVersion, err = parseVersion()
92 if err != nil {
93 - log.Errorf("invalid version number in code (must be semver): %q", Version)
93 + log.Criticalf("invalid version number in code (must be semver): %q", Version)
94 os.Exit(1)
95 }
96 log.Infof("go-ipfs Version: %s", currentVersion)