pkg/log: create wrapper around logrus

storage/memory/peer_store.go

@@ -10,10 +10,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 
 	"github.com/chihaya/chihaya/bittorrent"
+	"github.com/chihaya/chihaya/pkg/log"
 	"github.com/chihaya/chihaya/storage"
 )
 
@@ -77,40 +77,41 @@ func (cfg Config) LogFields() log.Fields {
 // This function warns to the logger when a value is changed.
 func (cfg Config) Validate() Config {
 	validcfg := cfg
+
 	if cfg.ShardCount <= 0 {
 		validcfg.ShardCount = defaultShardCount
-		log.WithFields(log.Fields{
+		log.Warn("falling back to default configuration", log.Fields{
 			"name":     Name + ".ShardCount",
 			"provided": cfg.ShardCount,
 			"default":  validcfg.ShardCount,
-		}).Warnln("falling back to default configuration")
+		})
 	}
 
 	if cfg.GarbageCollectionInterval <= 0 {
 		validcfg.GarbageCollectionInterval = defaultGarbageCollectionInterval
-		log.WithFields(log.Fields{
+		log.Warn("falling back to default configuration", log.Fields{
 			"name":     Name + ".GarbageCollectionInterval",
 			"provided": cfg.GarbageCollectionInterval,
 			"default":  validcfg.GarbageCollectionInterval,
-		}).Warnln("falling back to default configuration")
+		})
 	}
 
 	if cfg.PrometheusReportingInterval <= 0 {
 		validcfg.PrometheusReportingInterval = defaultPrometheusReportingInterval
-		log.WithFields(log.Fields{
+		log.Warn("falling back to default configuration", log.Fields{
 			"name":     Name + ".PrometheusReportingInterval",
 			"provided": cfg.PrometheusReportingInterval,
 			"default":  validcfg.PrometheusReportingInterval,
-		}).Warnln("falling back to default configuration")
+		})
 	}
 
 	if cfg.PeerLifetime <= 0 {
 		validcfg.PeerLifetime = defaultPeerLifetime
-		log.WithFields(log.Fields{
+		log.Warn("falling back to default configuration", log.Fields{
 			"name":     Name + ".PeerLifetime",
 			"provided": cfg.PeerLifetime,
 			"default":  validcfg.PeerLifetime,
-		}).Warnln("falling back to default configuration")
+		})
 	}
 
 	return validcfg
@@ -139,7 +140,7 @@ func New(provided Config) (storage.PeerStore, error) {
 				return
 			case <-time.After(cfg.GarbageCollectionInterval):
 				before := time.Now().Add(-cfg.PeerLifetime)
-				log.Debugln("memory: purging peers with no announces since", before)
+				log.Debug("storage: purging peers with no announces since", log.Fields{"before": before})
 				ps.collectGarbage(before)
 			}
 		}
@@ -174,7 +175,7 @@ func New(provided Config) (storage.PeerStore, error) {
 			case <-t.C:
 				before := time.Now()
 				ps.populateProm()
-				log.Debugf("memory: populateProm() took %s", time.Since(before))
+				log.Debug("storage: populateProm() finished", log.Fields{"timeTaken": time.Since(before)})
 			}
 		}
 	}()