Log errors as warnings - better suited log level

ipfs-shipyard · Oct 3, 2023 · 362276c · 362276c
1 parent 1815bc1
commit 362276c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ipfs/blockservice.go b/ipfs/blockservice.go
@@ -39,7 +39,7 @@ func (nbs *BlockService) Close() error {
 // Gets a block unless CID has been blocked.
 func (nbs *BlockService) GetBlock(ctx context.Context, c cid.Cid) (blocks.Block, error) {
 	if err := nbs.blocker.IsCidBlocked(c).ToError(); err != nil {
-		logger.Error(err.Response)
+		logger.Warn(err.Response)
 		return nil, err
 	}
 	return nbs.bs.GetBlock(ctx, c)
@@ -50,7 +50,7 @@ func (nbs *BlockService) GetBlocks(ctx context.Context, ks []cid.Cid) <-chan blo
 	var filtered []cid.Cid
 	for _, c := range ks {
 		if err := nbs.blocker.IsCidBlocked(c).ToError(); err != nil {
-			logger.Error(err.Response)
+			logger.Warn(err.Response)
 			logger.Warnf("GetBlocks dropped blocked block: %s", err)
 		} else {
 			filtered = append(filtered, c)
@@ -72,7 +72,7 @@ func (nbs *BlockService) Exchange() exchange.Interface {
 // AddBlock adds a block unless the CID is blocked.
 func (nbs *BlockService) AddBlock(ctx context.Context, o blocks.Block) error {
 	if err := nbs.blocker.IsCidBlocked(o.Cid()).ToError(); err != nil {
-		logger.Error(err.Response)
+		logger.Warn(err.Response)
 		return err
 	}
 	return nbs.bs.AddBlock(ctx, o)
@@ -83,7 +83,7 @@ func (nbs *BlockService) AddBlocks(ctx context.Context, bs []blocks.Block) error
 	var filtered []blocks.Block
 	for _, o := range bs {
 		if err := nbs.blocker.IsCidBlocked(o.Cid()).ToError(); err != nil {
-			logger.Error(err.Response)
+			logger.Warn(err.Response)
 			logger.Warnf("AddBlocks dropped blocked block: %s", err)
 		} else {
 			filtered = append(filtered, o)

diff --git a/ipfs/namesys.go b/ipfs/namesys.go
@@ -31,7 +31,7 @@ func WrapNameSystem(ns namesys.NameSystem, blocker *nopfs.Blocker) namesys.NameS
 // Resolve resolves an IPNS name unless it is blocked.
 func (ns *NameSystem) Resolve(ctx context.Context, name string, options ...opts.ResolveOpt) (path.Path, error) {
 	if err := ns.blocker.IsPathBlocked(path.FromString(name)).ToError(); err != nil {
-		logger.Error(err.Response)
+		logger.Warn(err.Response)
 		return "", err
 	}
 	return ns.ns.Resolve(ctx, name, options...)
@@ -41,7 +41,7 @@ func (ns *NameSystem) Resolve(ctx context.Context, name string, options ...opts.
 func (ns *NameSystem) ResolveAsync(ctx context.Context, name string, options ...opts.ResolveOpt) <-chan namesys.Result {
 	status := ns.blocker.IsPathBlocked(path.FromString(name))
 	if err := status.ToError(); err != nil {
-		logger.Error(err.Response)
+		logger.Warn(err.Response)
 		ch := make(chan namesys.Result, 1)
 		ch <- namesys.Result{
 			Path: status.Path,

diff --git a/ipfs/resolver.go b/ipfs/resolver.go
@@ -31,7 +31,7 @@ func WrapResolver(res resolver.Resolver, blocker *nopfs.Blocker) resolver.Resolv
 // ResolveToLastNode checks if the given path is blocked before resolving.
 func (res *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (cid.Cid, []string, error) {
 	if err := res.blocker.IsPathBlocked(fpath).ToError(); err != nil {
-		logger.Error(err.Response)
+		logger.Warn(err.Response)
 		return cid.Undef, nil, err
 	}
 	return res.resolver.ResolveToLastNode(ctx, fpath)
@@ -40,7 +40,7 @@ func (res *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (ci
 // ResolvePath checks if the given path is blocked before resolving.
 func (res *Resolver) ResolvePath(ctx context.Context, fpath path.Path) (ipld.Node, ipld.Link, error) {
 	if err := res.blocker.IsPathBlocked(fpath).ToError(); err != nil {
-		logger.Error(err.Response)
+		logger.Warn(err.Response)
 		return nil, nil, err
 	}
 	return res.resolver.ResolvePath(ctx, fpath)
@@ -49,7 +49,7 @@ func (res *Resolver) ResolvePath(ctx context.Context, fpath path.Path) (ipld.Nod
 // ResolvePathComponents checks if the given path is blocked before resolving.
 func (res *Resolver) ResolvePathComponents(ctx context.Context, fpath path.Path) ([]ipld.Node, error) {
 	if err := res.blocker.IsPathBlocked(fpath).ToError(); err != nil {
-		logger.Error(err.Response)
+		logger.Warn(err.Response)
 		return nil, err
 	}
 	return res.resolver.ResolvePathComponents(ctx, fpath)