From 6a707672c8cf6eff2a7bd14f5599b3348766b9e8 Mon Sep 17 00:00:00 2001 From: Poseidon Date: Wed, 29 Sep 2021 13:34:36 +0800 Subject: [PATCH] add trace log module (#2116) --- contract/trace_scheduler.go | 6 +++--- contract/trace_service.go | 10 +++++----- contract/trace_store.go | 5 +++-- contract/trace_updater.go | 6 +++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/contract/trace_scheduler.go b/contract/trace_scheduler.go index 0d3e35c8..b1dfecff 100644 --- a/contract/trace_scheduler.go +++ b/contract/trace_scheduler.go @@ -61,17 +61,17 @@ func (t *traceScheduler) processLoop() { for t.currentHeight, t.currentHash = beginHeight, beginHash; len(jobs) != 0; { if t.currentHeight == t.tracerService.BestHeight() { if ok, err := t.finishJobs(jobs); err != nil { - log.WithField("err", err).Error("finish jobs") + log.WithFields(log.Fields{"module": logModule, "err": err}).Error("finish jobs") } else if ok { break } } if ok, err := t.tryAttach(jobs); err != nil { - log.WithField("err", err).Error("try attach on trace scheduler") + log.WithFields(log.Fields{"module": logModule, "err": err}).Error("try attach on trace scheduler") } else if !ok { if err := t.detach(jobs); err != nil { - log.WithField("err", err).Error("detach on trace scheduler") + log.WithFields(log.Fields{"module": logModule, "err": err}).Error("detach on trace scheduler") } } } diff --git a/contract/trace_service.go b/contract/trace_service.go index f1838b68..a2d8313e 100644 --- a/contract/trace_service.go +++ b/contract/trace_service.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/sirupsen/logrus" + log "github.com/sirupsen/logrus" "github.com/bytom/bytom/protocol/bc" "github.com/bytom/bytom/protocol/bc/types" @@ -32,7 +32,7 @@ type TraceService struct { func NewTraceService(infra *Infrastructure) *TraceService { allInstances, err := infra.Repository.LoadInstances() if err != nil { - logrus.WithField("err", err).Fatal("load instances from db") + log.WithFields(log.Fields{"module": logModule, "err": err}).Fatal("load instances from db") } chainStatus := infra.Repository.GetChainStatus() @@ -40,7 +40,7 @@ func NewTraceService(infra *Infrastructure) *TraceService { bestHeight, bestHash := infra.Chain.BestChain() chainStatus = &ChainStatus{BlockHeight: bestHeight, BlockHash: bestHash} if err := infra.Repository.SaveChainStatus(chainStatus); err != nil { - logrus.WithField("err", err).Fatal("init chain status for trace service") + log.WithFields(log.Fields{"module": logModule, "err": err}).Fatal("init chain status for trace service") } } @@ -71,7 +71,7 @@ func dispatchInstances(instances []*Instance, scheduler *traceScheduler, finaliz } } else if inst.Status == Lagging { if err := scheduler.addNewJob(inst); err != nil { - logrus.WithField("err", err).Fatal("add new job when init tracer") + log.WithFields(log.Fields{"module": logModule, "err": err}).Fatal("add new job when init tracer") } } } @@ -193,7 +193,7 @@ func (t *TraceService) takeOverInstances(instances []*Instance, blockHash bc.Has } if err := t.infra.Repository.SaveInstances(instances); err != nil { - logrus.WithField("err", err).Error("save instances when take over instances") + log.WithFields(log.Fields{"module": logModule, "err": err}).Error("save instances when take over instances") return false } diff --git a/contract/trace_store.go b/contract/trace_store.go index c0ca7e38..646dbd15 100644 --- a/contract/trace_store.go +++ b/contract/trace_store.go @@ -3,9 +3,10 @@ package contract import ( "encoding/json" + log "github.com/sirupsen/logrus" + dbm "github.com/bytom/bytom/database/leveldb" "github.com/bytom/bytom/protocol/bc" - "github.com/sirupsen/logrus" ) const ( @@ -109,7 +110,7 @@ func (t *TraceStore) GetChainStatus() *ChainStatus { chainStatus := &ChainStatus{} if err := json.Unmarshal(data, chainStatus); err != nil { - logrus.WithField("err", err).Fatal("get chain status from trace store") + log.WithFields(log.Fields{"module": logModule, "err": err}).Fatal("get chain status from trace store") } return chainStatus diff --git a/contract/trace_updater.go b/contract/trace_updater.go index 6d4ebac9..351b77b9 100644 --- a/contract/trace_updater.go +++ b/contract/trace_updater.go @@ -30,17 +30,17 @@ func (t *TraceUpdater) Sync() { block, err := t.chain.GetBlockByHash(&bestHash) if err != nil { log.WithFields(log.Fields{"module": logModule, "err": err, "block_hash": bestHash.String()}).Errorf("trace updater get block") - return + break } if err := t.DetachBlock(block); err != nil { log.WithFields(log.Fields{"module": logModule, "err": err}).Error("trace updater detach block") - return + break } } else { if err := t.ApplyBlock(block); err != nil { log.WithFields(log.Fields{"module": logModule, "err": err}).Error("trace updater attach block") - return + break } } } -- 2.11.0