Merge pull request #733 from jbenet/cleaner-output

logs: removed all log.Errors unhelpful to users

.travis.yml

@@ -6,6 +6,6 @@ go:
   - tip
 
 script:
-  - TRAVES=true make test
+  - make test
 
 env: TEST_NO_FUSE=1 TEST_VERBOSE=1

blocks/set/dbset.go

@@ -22,7 +22,7 @@ func NewDBWrapperSet(d ds.Datastore, bset BlockSet) BlockSet {
 func (d *datastoreBlockSet) AddBlock(k util.Key) {
 	err := d.dstore.Put(k.DsKey(), []byte{})
 	if err != nil {
-		log.Errorf("blockset put error: %s", err)
+		log.Debugf("blockset put error: %s", err)
 	}
 
 	d.bset.AddBlock(k)

blockservice/blockservice.go

@@ -122,7 +122,7 @@ func (s *BlockService) GetBlocks(ctx context.Context, ks []u.Key) <-chan *blocks
 
 		rblocks, err := s.Exchange.GetBlocks(ctx, misses)
 		if err != nil {
-			log.Errorf("Error with GetBlocks: %s", err)
+			log.Debugf("Error with GetBlocks: %s", err)
 			return
 		}
 

cmd/ipfs/main.go

@@ -483,20 +483,20 @@ func (i *cmdInvocation) setupInterruptHandler() {
 			n, err := ctx.GetNode()
 			if err != nil {
 				log.Error(err)
-				log.Critical("Received interrupt signal, terminating...")
+				fmt.Println("Received interrupt signal, terminating...")
 				os.Exit(-1)
 			}
 
 			switch count {
 			case 0:
-				log.Critical("Received interrupt signal, shutting down...")
+				fmt.Println("Received interrupt signal, shutting down...")
 				go func() {
 					n.Close()
 					log.Info("Gracefully shut down.")
 				}()
 
 			default:
-				log.Critical("Received another interrupt before graceful shutdown, terminating...")
+				fmt.Println("Received another interrupt before graceful shutdown, terminating...")
 				os.Exit(-1)
 			}
 		}

commands/http/handler.go

@@ -129,7 +129,7 @@ func (i Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		// w.WriteHeader(200)
 		err = copyChunks(applicationJson, w, out)
 		if err != nil {
-			log.Error(err)
+			log.Debug(err)
 		}
 		return
 	}

core/commands/ping.go

@@ -150,7 +150,7 @@ func pingPeer(ctx context.Context, n *core.IpfsNode, pid peer.ID, numPings int)
 			ctx, _ := context.WithTimeout(ctx, kPingTimeout)
 			took, err := n.Routing.Ping(ctx, pid)
 			if err != nil {
-				log.Errorf("Ping error: %s", err)
+				log.Debugf("Ping error: %s", err)
 				outChan <- &PingResult{Text: fmt.Sprintf("Ping error: %s", err)}
 				break
 			}

core/commands/refs.go

@@ -110,7 +110,6 @@ Note: list all refs recursively with -r.
 
 			for _, o := range objs {
 				if _, err := rw.WriteRefs(o); err != nil {
-					log.Error(err)
 					eptr.SetError(err)
 					return
 				}
@@ -153,7 +152,6 @@ Displays the hashes of all local objects.
 			for k := range allKeys {
 				s := k.Pretty() + "\n"
 				if _, err := pipew.Write([]byte(s)); err != nil {
-					log.Error(err)
 					eptr.SetError(err)
 					return
 				}

core/commands/swarm.go

@@ -240,7 +240,7 @@ ipfs swarm disconnect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQA
 			conns := n.PeerHost.Network().ConnsToPeer(addr.ID())
 			for _, conn := range conns {
 				if !conn.RemoteMultiaddr().Equal(taddr) {
-					log.Error("it's not", conn.RemoteMultiaddr(), taddr)
+					log.Debug("it's not", conn.RemoteMultiaddr(), taddr)
 					continue
 				}
 

core/corehttp/gateway_handler.go

@@ -155,7 +155,7 @@ func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		errmsg = errmsg + "bad request for " + r.URL.Path
 	}
 	w.Write([]byte(errmsg))
-	log.Error(errmsg)
+	log.Debug(errmsg)
 }
 
 func (i *gatewayHandler) getHandler(w http.ResponseWriter, r *http.Request) {
@@ -174,7 +174,6 @@ func (i *gatewayHandler) getHandler(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusBadRequest)
 		}
 
-		log.Error(err)
 		w.Write([]byte(err.Error()))
 		return
 	}
@@ -290,7 +289,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
 	urlPath := r.URL.Path
 	pathext := urlPath[5:]
 	var err error
-	if urlPath == IpfsPathPrefix + "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn/" {
+	if urlPath == IpfsPathPrefix+"QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn/" {
 		i.putEmptyDirHandler(w, r)
 		return
 	}
@@ -326,7 +325,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
 		err = fmt.Errorf("Cannot override existing object")
 		w.WriteHeader(http.StatusBadRequest)
 		w.Write([]byte(err.Error()))
-		log.Error("%s", err)
+		log.Debug("%s", err)
 		return
 	}
 
@@ -450,15 +449,15 @@ func webError(w http.ResponseWriter, message string, err error, defaultCode int)
 
 func webErrorWithCode(w http.ResponseWriter, message string, err error, code int) {
 	w.WriteHeader(code)
-	log.Errorf("%s: %s", message, err)
+	log.Debugf("%s: %s", message, err)
 	w.Write([]byte(message + ": " + err.Error()))
 }
 
 // return a 500 error and log
 func internalWebError(w http.ResponseWriter, err error) {
 	w.WriteHeader(http.StatusInternalServerError)
 	w.Write([]byte(err.Error()))
-	log.Error("%s", err)
+	log.Debug("%s", err)
 }
 
 // Directory listing template

core/corerepo/gc.go

@@ -51,7 +51,7 @@ func GarbageCollectAsync(n *core.IpfsNode, ctx context.Context) (<-chan *KeyRemo
 				if !n.Pinning.IsPinned(k) {
 					err := n.Blockstore.DeleteBlock(k)
 					if err != nil {
-						log.Errorf("Error removing key from blockstore: %s", err)
+						log.Debugf("Error removing key from blockstore: %s", err)
 						continue
 					}
 					select {

diagnostics/diag.go

@@ -187,7 +187,7 @@ func (d *Diagnostics) getDiagnosticFromPeers(ctx context.Context, peers map[peer
 			defer wg.Done()
 			out, err := d.getDiagnosticFromPeer(ctx, p, pmes)
 			if err != nil {
-				log.Errorf("Error getting diagnostic from %s: %s", p, err)
+				log.Debugf("Error getting diagnostic from %s: %s", p, err)
 				return
 			}
 			for d := range out {
@@ -234,17 +234,17 @@ func (d *Diagnostics) getDiagnosticFromPeer(ctx context.Context, p peer.ID, pmes
 		for {
 			rpmes := new(pb.Message)
 			if err := r.ReadMsg(rpmes); err != nil {
-				log.Errorf("Error reading diagnostic from stream: %s", err)
+				log.Debugf("Error reading diagnostic from stream: %s", err)
 				return
 			}
 			if rpmes == nil {
-				log.Error("Got no response back from diag request.")
+				log.Debug("Got no response back from diag request.")
 				return
 			}
 
 			di, err := decodeDiagJson(rpmes.GetData())
 			if err != nil {
-				log.Error(err)
+				log.Debug(err)
 				return
 			}
 
@@ -276,7 +276,7 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
 	// deserialize msg
 	pmes := new(pb.Message)
 	if err := r.ReadMsg(pmes); err != nil {
-		log.Errorf("Failed to decode protobuf message: %v", err)
+		log.Debugf("Failed to decode protobuf message: %v", err)
 		return nil
 	}
 
@@ -292,7 +292,7 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
 	resp := newMessage(pmes.GetDiagID())
 	resp.Data = d.getDiagInfo().Marshal()
 	if err := w.WriteMsg(resp); err != nil {
-		log.Errorf("Failed to write protobuf message over stream: %s", err)
+		log.Debugf("Failed to write protobuf message over stream: %s", err)
 		return err
 	}
 
@@ -305,14 +305,14 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
 
 	dpeers, err := d.getDiagnosticFromPeers(ctx, d.getPeers(), pmes)
 	if err != nil {
-		log.Errorf("diagnostic from peers err: %s", err)
+		log.Debugf("diagnostic from peers err: %s", err)
 		return err
 	}
 	for b := range dpeers {
 		resp := newMessage(pmes.GetDiagID())
 		resp.Data = b.Marshal()
 		if err := w.WriteMsg(resp); err != nil {
-			log.Errorf("Failed to write protobuf message over stream: %s", err)
+			log.Debugf("Failed to write protobuf message over stream: %s", err)
 			return err
 		}
 	}

exchange/bitswap/bitswap.go

@@ -211,7 +211,7 @@ func (bs *bitswap) sendWantlistMsgToPeers(ctx context.Context, m bsmsg.BitSwapMe
 		go func(p peer.ID) {
 			defer wg.Done()
 			if err := bs.send(ctx, p, m); err != nil {
-				log.Error(err) // TODO remove if too verbose
+				log.Debug(err) // TODO remove if too verbose
 			}
 		}(peerToQuery)
 	}
@@ -258,7 +258,7 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context, entries []wantli
 
 	err := bs.sendWantlistToPeers(ctx, sendToPeers)
 	if err != nil {
-		log.Errorf("sendWantlistToPeers error: %s", err)
+		log.Debugf("sendWantlistToPeers error: %s", err)
 	}
 }
 
@@ -268,12 +268,12 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
 	defer log.EventBegin(ctx, "receiveMessage", p, incoming).Done()
 
 	if p == "" {
-		log.Error("Received message from nil peer!")
+		log.Debug("Received message from nil peer!")
 		// TODO propagate the error upward
 		return "", nil
 	}
 	if incoming == nil {
-		log.Error("Got nil bitswap message!")
+		log.Debug("Got nil bitswap message!")
 		// TODO propagate the error upward
 		return "", nil
 	}
@@ -287,7 +287,7 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
 	for _, block := range incoming.Blocks() {
 		hasBlockCtx, _ := context.WithTimeout(ctx, hasBlockTimeout)
 		if err := bs.HasBlock(hasBlockCtx, block); err != nil {
-			log.Error(err)
+			log.Debug(err)
 		}
 	}
 	var keys []u.Key
@@ -308,7 +308,7 @@ func (bs *bitswap) PeerConnected(p peer.ID) {
 	close(peers)
 	err := bs.sendWantlistToPeers(context.TODO(), peers)
 	if err != nil {
-		log.Errorf("error sending wantlist: %s", err)
+		log.Debugf("error sending wantlist: %s", err)
 	}
 }
 
@@ -329,13 +329,13 @@ func (bs *bitswap) cancelBlocks(ctx context.Context, bkeys []u.Key) {
 	for _, p := range bs.engine.Peers() {
 		err := bs.send(ctx, p, message)
 		if err != nil {
-			log.Errorf("Error sending message: %s", err)
+			log.Debugf("Error sending message: %s", err)
 		}
 	}
 }
 
 func (bs *bitswap) ReceiveError(err error) {
-	log.Errorf("Bitswap ReceiveError: %s", err)
+	log.Debugf("Bitswap ReceiveError: %s", err)
 	// TODO log the network error
 	// TODO bubble the network error up to the parent context/error logger
 }
@@ -413,7 +413,7 @@ func (bs *bitswap) clientWorker(parent context.Context) {
 			providers := bs.network.FindProvidersAsync(child, keys[0], maxProvidersPerRequest)
 			err := bs.sendWantlistToPeers(ctx, providers)
 			if err != nil {
-				log.Errorf("error sending wantlist: %s", err)
+				log.Debugf("error sending wantlist: %s", err)
 			}
 		case <-parent.Done():
 			return

exchange/bitswap/network/ipfs_impl.go

@@ -62,7 +62,7 @@ func (bsnet *impl) SendMessage(
 	defer s.Close()
 
 	if err := outgoing.ToNet(s); err != nil {
-		log.Errorf("error: %s", err)
+		log.Debugf("error: %s", err)
 		return err
 	}
 
@@ -81,13 +81,13 @@ func (bsnet *impl) SendRequest(
 	defer s.Close()
 
 	if err := outgoing.ToNet(s); err != nil {
-		log.Errorf("error: %s", err)
+		log.Debugf("error: %s", err)
 		return nil, err
 	}
 
 	incoming, err := bsmsg.FromNet(s)
 	if err != nil {
-		log.Errorf("error: %s", err)
+		log.Debugf("error: %s", err)
 		return incoming, err
 	}
 
@@ -150,7 +150,7 @@ func (bsnet *impl) handleNewStream(s inet.Stream) {
 	received, err := bsmsg.FromNet(s)
 	if err != nil {
 		go bsnet.receiver.ReceiveError(err)
-		log.Errorf("bitswap net handleNewStream from %s error: %s", s.Conn().RemotePeer(), err)
+		log.Debugf("bitswap net handleNewStream from %s error: %s", s.Conn().RemotePeer(), err)
 		return
 	}
 

exchange/reprovide/reprovide.go

@@ -41,7 +41,7 @@ func (rp *Reprovider) ProvideEvery(ctx context.Context, tick time.Duration) {
 		case <-after:
 			err := rp.Reprovide(ctx)
 			if err != nil {
-				log.Error(err)
+				log.Debug(err)
 			}
 			after = time.After(tick)
 		}
@@ -57,7 +57,7 @@ func (rp *Reprovider) Reprovide(ctx context.Context) error {
 		op := func() error {
 			err := rp.rsys.Provide(ctx, k)
 			if err != nil {
-				log.Warningf("Failed to provide key: %s", err)
+				log.Debugf("Failed to provide key: %s", err)
 			}
 			return err
 		}
@@ -66,7 +66,7 @@ func (rp *Reprovider) Reprovide(ctx context.Context) error {
 		// eventually work contexts into it. low priority.
 		err := backoff.Retry(op, backoff.NewExponentialBackOff())
 		if err != nil {
-			log.Errorf("Providing failed after number of retries: %s", err)
+			log.Debugf("Providing failed after number of retries: %s", err)
 			return err
 		}
 	}