Skip to content

Commit e24f169

Browse files
jbenetjbenet
committed
Merge pull request #733 from jbenet/cleaner-output
logs: removed all log.Errors unhelpful to users
2 parents 61c97f8 + bdced92 commit e24f169

File tree

30 files changed

+82
-118
lines changed

30 files changed

+82
-118
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ go:
66
- tip
77

88
script:
9-
- TRAVES=true make test
9+
- make test
1010

1111
env: TEST_NO_FUSE=1 TEST_VERBOSE=1

‎blocks/set/dbset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func NewDBWrapperSet(d ds.Datastore, bset BlockSet) BlockSet {
2222
func (d *datastoreBlockSet) AddBlock(k util.Key) {
2323
err := d.dstore.Put(k.DsKey(), []byte{})
2424
if err != nil {
25-
log.Errorf("blockset put error: %s", err)
25+
log.Debugf("blockset put error: %s", err)
2626
}
2727

2828
d.bset.AddBlock(k)

‎blockservice/blockservice.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func (s *BlockService) GetBlocks(ctx context.Context, ks []u.Key) <-chan *blocks
122122

123123
rblocks, err := s.Exchange.GetBlocks(ctx, misses)
124124
if err != nil {
125-
log.Errorf("Error with GetBlocks: %s", err)
125+
log.Debugf("Error with GetBlocks: %s", err)
126126
return
127127
}
128128

‎cmd/ipfs/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -483,20 +483,20 @@ func (i *cmdInvocation) setupInterruptHandler() {
483483
n, err := ctx.GetNode()
484484
if err != nil {
485485
log.Error(err)
486-
log.Critical("Received interrupt signal, terminating...")
486+
fmt.Println("Received interrupt signal, terminating...")
487487
os.Exit(-1)
488488
}
489489

490490
switch count {
491491
case 0:
492-
log.Critical("Received interrupt signal, shutting down...")
492+
fmt.Println("Received interrupt signal, shutting down...")
493493
go func() {
494494
n.Close()
495495
log.Info("Gracefully shut down.")
496496
}()
497497

498498
default:
499-
log.Critical("Received another interrupt before graceful shutdown, terminating...")
499+
fmt.Println("Received another interrupt before graceful shutdown, terminating...")
500500
os.Exit(-1)
501501
}
502502
}

‎commands/http/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func (i Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
129129
// w.WriteHeader(200)
130130
err = copyChunks(applicationJson, w, out)
131131
if err != nil {
132-
log.Error(err)
132+
log.Debug(err)
133133
}
134134
return
135135
}

‎core/commands/ping.go

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

‎core/commands/refs.go

-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ Note: list all refs recursively with -r.
110110

111111
for _, o := range objs {
112112
if _, err := rw.WriteRefs(o); err != nil {
113-
log.Error(err)
114113
eptr.SetError(err)
115114
return
116115
}
@@ -153,7 +152,6 @@ Displays the hashes of all local objects.
153152
for k := range allKeys {
154153
s := k.Pretty() + "\n"
155154
if _, err := pipew.Write([]byte(s)); err != nil {
156-
log.Error(err)
157155
eptr.SetError(err)
158156
return
159157
}

‎core/commands/swarm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ ipfs swarm disconnect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQA
240240
conns := n.PeerHost.Network().ConnsToPeer(addr.ID())
241241
for _, conn := range conns {
242242
if !conn.RemoteMultiaddr().Equal(taddr) {
243-
log.Error("it's not", conn.RemoteMultiaddr(), taddr)
243+
log.Debug("it's not", conn.RemoteMultiaddr(), taddr)
244244
continue
245245
}
246246

‎core/corehttp/gateway_handler.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
155155
errmsg = errmsg + "bad request for " + r.URL.Path
156156
}
157157
w.Write([]byte(errmsg))
158-
log.Error(errmsg)
158+
log.Debug(errmsg)
159159
}
160160

161161
func (i *gatewayHandler) getHandler(w http.ResponseWriter, r *http.Request) {
@@ -174,7 +174,6 @@ func (i *gatewayHandler) getHandler(w http.ResponseWriter, r *http.Request) {
174174
w.WriteHeader(http.StatusBadRequest)
175175
}
176176

177-
log.Error(err)
178177
w.Write([]byte(err.Error()))
179178
return
180179
}
@@ -290,7 +289,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
290289
urlPath := r.URL.Path
291290
pathext := urlPath[5:]
292291
var err error
293-
if urlPath == IpfsPathPrefix + "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn/" {
292+
if urlPath == IpfsPathPrefix+"QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn/" {
294293
i.putEmptyDirHandler(w, r)
295294
return
296295
}
@@ -326,7 +325,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
326325
err = fmt.Errorf("Cannot override existing object")
327326
w.WriteHeader(http.StatusBadRequest)
328327
w.Write([]byte(err.Error()))
329-
log.Error("%s", err)
328+
log.Debug("%s", err)
330329
return
331330
}
332331

@@ -450,15 +449,15 @@ func webError(w http.ResponseWriter, message string, err error, defaultCode int)
450449

451450
func webErrorWithCode(w http.ResponseWriter, message string, err error, code int) {
452451
w.WriteHeader(code)
453-
log.Errorf("%s: %s", message, err)
452+
log.Debugf("%s: %s", message, err)
454453
w.Write([]byte(message + ": " + err.Error()))
455454
}
456455

457456
// return a 500 error and log
458457
func internalWebError(w http.ResponseWriter, err error) {
459458
w.WriteHeader(http.StatusInternalServerError)
460459
w.Write([]byte(err.Error()))
461-
log.Error("%s", err)
460+
log.Debug("%s", err)
462461
}
463462

464463
// Directory listing template

‎core/corerepo/gc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func GarbageCollectAsync(n *core.IpfsNode, ctx context.Context) (<-chan *KeyRemo
5151
if !n.Pinning.IsPinned(k) {
5252
err := n.Blockstore.DeleteBlock(k)
5353
if err != nil {
54-
log.Errorf("Error removing key from blockstore: %s", err)
54+
log.Debugf("Error removing key from blockstore: %s", err)
5555
continue
5656
}
5757
select {

‎diagnostics/diag.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func (d *Diagnostics) getDiagnosticFromPeers(ctx context.Context, peers map[peer
187187
defer wg.Done()
188188
out, err := d.getDiagnosticFromPeer(ctx, p, pmes)
189189
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)
191191
return
192192
}
193193
for d := range out {
@@ -234,17 +234,17 @@ func (d *Diagnostics) getDiagnosticFromPeer(ctx context.Context, p peer.ID, pmes
234234
for {
235235
rpmes := new(pb.Message)
236236
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)
238238
return
239239
}
240240
if rpmes == nil {
241-
log.Error("Got no response back from diag request.")
241+
log.Debug("Got no response back from diag request.")
242242
return
243243
}
244244

245245
di, err := decodeDiagJson(rpmes.GetData())
246246
if err != nil {
247-
log.Error(err)
247+
log.Debug(err)
248248
return
249249
}
250250

@@ -276,7 +276,7 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
276276
// deserialize msg
277277
pmes := new(pb.Message)
278278
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)
280280
return nil
281281
}
282282

@@ -292,7 +292,7 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
292292
resp := newMessage(pmes.GetDiagID())
293293
resp.Data = d.getDiagInfo().Marshal()
294294
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)
296296
return err
297297
}
298298

@@ -305,14 +305,14 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, s inet.Stream) error {
305305

306306
dpeers, err := d.getDiagnosticFromPeers(ctx, d.getPeers(), pmes)
307307
if err != nil {
308-
log.Errorf("diagnostic from peers err: %s", err)
308+
log.Debugf("diagnostic from peers err: %s", err)
309309
return err
310310
}
311311
for b := range dpeers {
312312
resp := newMessage(pmes.GetDiagID())
313313
resp.Data = b.Marshal()
314314
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)
316316
return err
317317
}
318318
}

‎exchange/bitswap/bitswap.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (bs *bitswap) sendWantlistMsgToPeers(ctx context.Context, m bsmsg.BitSwapMe
211211
go func(p peer.ID) {
212212
defer wg.Done()
213213
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
215215
}
216216
}(peerToQuery)
217217
}
@@ -258,7 +258,7 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context, entries []wantli
258258

259259
err := bs.sendWantlistToPeers(ctx, sendToPeers)
260260
if err != nil {
261-
log.Errorf("sendWantlistToPeers error: %s", err)
261+
log.Debugf("sendWantlistToPeers error: %s", err)
262262
}
263263
}
264264

@@ -268,12 +268,12 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
268268
defer log.EventBegin(ctx, "receiveMessage", p, incoming).Done()
269269

270270
if p == "" {
271-
log.Error("Received message from nil peer!")
271+
log.Debug("Received message from nil peer!")
272272
// TODO propagate the error upward
273273
return "", nil
274274
}
275275
if incoming == nil {
276-
log.Error("Got nil bitswap message!")
276+
log.Debug("Got nil bitswap message!")
277277
// TODO propagate the error upward
278278
return "", nil
279279
}
@@ -287,7 +287,7 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
287287
for _, block := range incoming.Blocks() {
288288
hasBlockCtx, _ := context.WithTimeout(ctx, hasBlockTimeout)
289289
if err := bs.HasBlock(hasBlockCtx, block); err != nil {
290-
log.Error(err)
290+
log.Debug(err)
291291
}
292292
}
293293
var keys []u.Key
@@ -308,7 +308,7 @@ func (bs *bitswap) PeerConnected(p peer.ID) {
308308
close(peers)
309309
err := bs.sendWantlistToPeers(context.TODO(), peers)
310310
if err != nil {
311-
log.Errorf("error sending wantlist: %s", err)
311+
log.Debugf("error sending wantlist: %s", err)
312312
}
313313
}
314314

@@ -329,13 +329,13 @@ func (bs *bitswap) cancelBlocks(ctx context.Context, bkeys []u.Key) {
329329
for _, p := range bs.engine.Peers() {
330330
err := bs.send(ctx, p, message)
331331
if err != nil {
332-
log.Errorf("Error sending message: %s", err)
332+
log.Debugf("Error sending message: %s", err)
333333
}
334334
}
335335
}
336336

337337
func (bs *bitswap) ReceiveError(err error) {
338-
log.Errorf("Bitswap ReceiveError: %s", err)
338+
log.Debugf("Bitswap ReceiveError: %s", err)
339339
// TODO log the network error
340340
// TODO bubble the network error up to the parent context/error logger
341341
}
@@ -413,7 +413,7 @@ func (bs *bitswap) clientWorker(parent context.Context) {
413413
providers := bs.network.FindProvidersAsync(child, keys[0], maxProvidersPerRequest)
414414
err := bs.sendWantlistToPeers(ctx, providers)
415415
if err != nil {
416-
log.Errorf("error sending wantlist: %s", err)
416+
log.Debugf("error sending wantlist: %s", err)
417417
}
418418
case <-parent.Done():
419419
return

‎exchange/bitswap/network/ipfs_impl.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (bsnet *impl) SendMessage(
6262
defer s.Close()
6363

6464
if err := outgoing.ToNet(s); err != nil {
65-
log.Errorf("error: %s", err)
65+
log.Debugf("error: %s", err)
6666
return err
6767
}
6868

@@ -81,13 +81,13 @@ func (bsnet *impl) SendRequest(
8181
defer s.Close()
8282

8383
if err := outgoing.ToNet(s); err != nil {
84-
log.Errorf("error: %s", err)
84+
log.Debugf("error: %s", err)
8585
return nil, err
8686
}
8787

8888
incoming, err := bsmsg.FromNet(s)
8989
if err != nil {
90-
log.Errorf("error: %s", err)
90+
log.Debugf("error: %s", err)
9191
return incoming, err
9292
}
9393

@@ -150,7 +150,7 @@ func (bsnet *impl) handleNewStream(s inet.Stream) {
150150
received, err := bsmsg.FromNet(s)
151151
if err != nil {
152152
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)
154154
return
155155
}
156156

‎exchange/reprovide/reprovide.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (rp *Reprovider) ProvideEvery(ctx context.Context, tick time.Duration) {
4141
case <-after:
4242
err := rp.Reprovide(ctx)
4343
if err != nil {
44-
log.Error(err)
44+
log.Debug(err)
4545
}
4646
after = time.After(tick)
4747
}
@@ -57,7 +57,7 @@ func (rp *Reprovider) Reprovide(ctx context.Context) error {
5757
op := func() error {
5858
err := rp.rsys.Provide(ctx, k)
5959
if err != nil {
60-
log.Warningf("Failed to provide key: %s", err)
60+
log.Debugf("Failed to provide key: %s", err)
6161
}
6262
return err
6363
}
@@ -66,7 +66,7 @@ func (rp *Reprovider) Reprovide(ctx context.Context) error {
6666
// eventually work contexts into it. low priority.
6767
err := backoff.Retry(op, backoff.NewExponentialBackOff())
6868
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)
7070
return err
7171
}
7272
}

0 commit comments

Comments
 (0)