Merge pull request #80 from berty/dev/moul/quiet-log

chore: decrease log verbosity for context canceled
berty · Oct 1, 2021 · c8ecbcc · c8ecbcc
2 parents 5030118 + 37088ee
commit c8ecbcc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/baseorbitdb/orbitdb.go b/baseorbitdb/orbitdb.go
@@ -924,7 +924,9 @@ func (o *orbitDB) onNewPeerJoined(ctx context.Context, p p2pcore.PeerID, store S
 	_, err = o.exchangeHeads(ctx, p, store)
 
 	if err != nil {
-		o.logger.Error("unable to exchange heads", zap.Error(err))
+		if !errors.Is(err, context.Canceled) {
+			o.logger.Error("unable to exchange heads", zap.Error(err))
+		}
 		return
 	}
 

diff --git a/iface/interface.go b/iface/interface.go
@@ -1,12 +1,12 @@
 package iface
 
 import (
-	"berty.tech/go-ipfs-log/enc"
-	"berty.tech/go-ipfs-log/iface"
 	"context"
 
 	ipfslog "berty.tech/go-ipfs-log"
+	"berty.tech/go-ipfs-log/enc"
 	"berty.tech/go-ipfs-log/identityprovider"
+	"berty.tech/go-ipfs-log/iface"
 	"berty.tech/go-ipfs-log/keystore"
 	"berty.tech/go-orbit-db/accesscontroller"
 	"berty.tech/go-orbit-db/address"

diff --git a/pubsub/pubsubraw/pubsub.go b/pubsub/pubsubraw/pubsub.go
@@ -41,7 +41,12 @@ func (p *psTopic) WatchPeers(ctx context.Context) (<-chan events.Event, error) {
 		for {
 			evt, err := ph.NextPeerEvent(ctx)
 			if err != nil {
-				p.ps.logger.Error("", zap.Error(err))
+				switch err {
+				case context.Canceled:
+					p.ps.logger.Debug("watch peers ended", zap.Error(err))
+				default:
+					p.ps.logger.Error("watch next peer event failed", zap.Error(err))
+				}
 				return
 			}
 

diff --git a/tests/replicate_automatically_test.go b/tests/replicate_automatically_test.go
@@ -1,7 +1,6 @@
 package tests
 
 import (
-	"berty.tech/go-orbit-db/events"
 	"context"
 	"fmt"
 	"strings"
@@ -10,6 +9,7 @@ import (
 
 	orbitdb "berty.tech/go-orbit-db"
 	"berty.tech/go-orbit-db/accesscontroller"
+	"berty.tech/go-orbit-db/events"
 	"berty.tech/go-orbit-db/iface"
 	"berty.tech/go-orbit-db/stores"
 	"berty.tech/go-orbit-db/stores/operation"

diff --git a/tests/replicate_test.go b/tests/replicate_test.go
@@ -1,7 +1,6 @@
 package tests
 
 import (
-	"berty.tech/go-ipfs-log/enc"
 	"context"
 	"fmt"
 	"os"
@@ -10,6 +9,7 @@ import (
 	"time"
 
 	ipfslog "berty.tech/go-ipfs-log"
+	"berty.tech/go-ipfs-log/enc"
 	orbitdb "berty.tech/go-orbit-db"
 	"berty.tech/go-orbit-db/accesscontroller"
 	"berty.tech/go-orbit-db/events"

diff --git a/tests/testing_test.go b/tests/testing_test.go
@@ -2,13 +2,14 @@ package tests
 
 import (
 	"context"
+	"io/ioutil"
+	"os"
+	"testing"
+
 	"github.com/libp2p/go-libp2p"
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/peerstore"
-	"io/ioutil"
-	"os"
-	"testing"
 
 	ipfsCore "github.com/ipfs/go-ipfs/core"
 	"github.com/ipfs/go-ipfs/core/coreapi"