From 4b8b354365749dd6a8685092e32e7ad3c7367432 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <code@hector.link>
Date: Tue, 7 Apr 2020 19:05:18 +0200
Subject: [PATCH] s/log/logger

---
 arc_cache.go   | 3 +++
 blockstore.go  | 8 ++++----
 bloom_cache.go | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/arc_cache.go b/arc_cache.go
index 3159b92..6750dc2 100644
--- a/arc_cache.go
+++ b/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
 	}
 
diff --git a/blockstore.go b/blockstore.go
index f25cc6a..d1e0e2c 100644
--- a/blockstore.go
+++ b/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")
@@ -141,7 +141,7 @@ func (bs *blockstore) HashOnRead(enabled bool) {
 
 func (bs *blockstore) Get(ctx context.Context, k cid.Cid) (blocks.Block, error) {
 	if !k.Defined() {
-		log.Error("undefined cid in blockstore")
+		logger.Error("undefined cid in blockstore")
 		return nil, ipld.ErrNotFound{k}
 	}
 	bdata, err := bs.datastore.Get(ctx, dshelp.MultihashToDsKey(k.Hash()))
@@ -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)
diff --git a/bloom_cache.go b/bloom_cache.go
index 7630394..4a34e31 100644
--- a/bloom_cache.go
+++ b/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