Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-07-28 10:08:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

pkg/log: create wrapper around logrus

Browse Source
This commit is contained in:
Leo Balduf
2017-06-20 14:58:44 +02:00
parent 153ad325b7
commit 8ed171b0ea
13 changed files with 211 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage/memory/peer_store.go
+12 -11
View File
@@ -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)})
}
}
}()
storage/memorybysubnet/peer_store.go
+13 -11
View File
@@ -11,10 +11,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"
)
@@ -82,40 +82,42 @@ 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
@@ -147,7 +149,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)
}
}
@@ -182,7 +184,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)})
}
}
}()
storage/storage.go
+4 -5
View File
@@ -4,9 +4,8 @@ import (
"errors"
"sync"
log "github.com/Sirupsen/logrus"
"github.com/chihaya/chihaya/bittorrent"
"github.com/chihaya/chihaya/pkg/log"
"github.com/chihaya/chihaya/pkg/stop"
)
@@ -84,14 +83,14 @@ type PeerStore interface {
// returned.
ScrapeSwarm(infoHash bittorrent.InfoHash, addressFamily bittorrent.AddressFamily) bittorrent.Scrape
// stop is an interface that expects a Stop method to stop the
// stop.Stopper is an interface that expects a Stop method to stop the
// PeerStore.
// For more details see the documentation in the stop package.
stop.Stopper
// LogFields returns a loggable version of the data used to configure and
// log.Fielder returns a loggable version of the data used to configure and
// operate a particular peer store.
LogFields() log.Fields
log.Fielder
}
// RegisterDriver makes a Driver available by the provided name.