s/log/logger

arc_cache.go

@@ -114,6 +114,9 @@ func (b *arccache) DeleteBlock(ctx context.Context, k cid.Cid) error {
 
 func (b *arccache) Has(ctx context.Context, k cid.Cid) (bool, error) {
 	if !k.Defined() {
+		logger.Error("undefined cid in arccache")
+		// Return cache invalid so the call to blockstore happens
+		// in case of invalid key and correct error is created.
 		return false, nil
 	}
 

blockstore.go

@@ -19,7 +19,7 @@ import (
 	uatomic "go.uber.org/atomic"
 )
 
-var log = logging.Logger("blockstore")
+var logger = logging.Logger("blockstore")
 
 // BlockPrefix namespaces blockstore datastores
 var BlockPrefix = ds.NewKey("blocks")
@@ -239,14 +239,14 @@ func (bs *blockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
 				return
 			}
 			if e.Error != nil {
-				log.Errorf("blockstore.AllKeysChan got err: %s", e.Error)
+				logger.Errorf("blockstore.AllKeysChan got err: %s", e.Error)
 				return
 			}
 
 			// need to convert to key.Key using key.KeyFromDsKey.
 			bk, err := dshelp.BinaryFromDsKey(ds.RawKey(e.Key))
 			if err != nil {
-				log.Warningf("error parsing key from binary: %s", err)
+				logger.Warningf("error parsing key from binary: %s", err)
 				continue
 			}
 			k := cid.NewCidV1(cid.Raw, bk)

bloom_cache.go

@@ -38,9 +38,9 @@ func bloomCached(ctx context.Context, bs Blockstore, bloomSize, hashCount int) (
 		if err != nil {
 			select {
 			case <-ctx.Done():
-				log.Warning("Cache rebuild closed by context finishing: ", err)
+				logger.Warning("Cache rebuild closed by context finishing: ", err)
 			default:
-				log.Error(err)
+				logger.Error(err)
 			}
 			return
 		}
@@ -95,7 +95,7 @@ func (b *bloomcache) Wait(ctx context.Context) error {
 }
 
 func (b *bloomcache) build(ctx context.Context) error {
-	evt := log.EventBegin(ctx, "bloomcache.build")
+	evt := logger.EventBegin(ctx, "bloomcache.build")
 	defer evt.Done()
 	defer close(b.buildChan)
 
@@ -132,7 +132,7 @@ func (b *bloomcache) DeleteBlock(ctx context.Context, k cid.Cid) error {
 func (b *bloomcache) hasCached(k cid.Cid) (has bool, ok bool) {
 	b.total.Inc()
 	if !k.Defined() {
-		log.Error("undefined in bloom cache")
+		logger.Error("undefined in bloom cache")
 		// Return cache invalid so call to blockstore
 		// in case of invalid key is forwarded deeper
 		return false, false