Skip to content

Commit a6d031c

Browse files
committed
log & tiny fix
1 parent 781c440 commit a6d031c

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

cmd/main.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
11
package main
22

33
import (
4+
"os"
5+
"os/signal"
6+
"syscall"
7+
8+
"github.com/CortexFoundation/CortexTheseus/log"
49
"github.com/CortexFoundation/robot"
510
"github.com/CortexFoundation/torrentfs/params"
611
)
712

813
func main() {
14+
glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(true)))
15+
glogger.Verbosity(log.LvlInfo)
16+
glogger.Vmodule("")
17+
log.Root().SetHandler(glogger)
918
cfg := &params.DefaultConfig
10-
cfg.DataDir = "test"
19+
cfg.DataDir = ".storage"
20+
cfg.RpcURI = "http://127.0.0.1:8545"
1121
if m, err := robot.New(cfg, true, false, false, nil); err != nil {
1222
panic(err)
1323
} else {
14-
m.Start()
15-
m.Stop()
24+
if err := m.Start(); err != nil {
25+
log.Error("start failed", "err", err)
26+
}
27+
defer m.Stop()
28+
var c = make(chan os.Signal, 1)
29+
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
30+
<-c
1631
}
1732
}

monitor.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ func (m *Monitor) syncLatestBlock() {
655655
}
656656
counter++
657657
if counter%10 == 0 {
658-
//log.Info(backend.ProgressBar(int64(m.lastNumber), int64(m.CurrentNumber()), ""), "blocks", progress, "current", m.CurrentNumber(), "latest", m.lastNumber, "end", end, "txs", m.fs.Txs(), "ckp", m.fs.CheckPoint(), "last", m.fs.LastListenBlockNumber())
658+
log.Info("Monitor status", "blocks", progress, "current", m.CurrentNumber(), "latest", m.lastNumber, "end", end, "txs", m.fs.Txs(), "ckp", m.fs.CheckPoint(), "last", m.fs.LastListenBlockNumber())
659659
counter = 0
660660
}
661661
m.fs.Flush()
@@ -812,8 +812,8 @@ func (m *Monitor) solve(block *types.Block) error {
812812
i := block.Number
813813
if i%65536 == 0 {
814814
defer func() {
815-
//elapsedA := time.Duration(mclock.Now()) - time.Duration(m.start)
816-
//log.Info(backend.ProgressBar(int64(i), int64(m.CurrentNumber()), "Nas monitor"), "start", m.startNumber, "max", uint64(m.CurrentNumber()), "last", m.lastNumber, "cur", i, "bps", math.Abs(float64(i)-float64(m.startNumber))*1000*1000*1000/float64(elapsedA), "elapsed", common.PrettyDuration(elapsedA), "scope", m.scope, "db", common.PrettyDuration(m.fs.Metrics()), "blocks", len(m.fs.Blocks()), "txs", m.fs.Txs(), "files", len(m.fs.Files()), "root", m.fs.Root())
815+
elapsedA := time.Duration(mclock.Now()) - time.Duration(m.start)
816+
log.Info("Nas monitor", "start", m.startNumber, "max", uint64(m.CurrentNumber()), "last", m.lastNumber, "cur", i, "bps", math.Abs(float64(i)-float64(m.startNumber))*1000*1000*1000/float64(elapsedA), "elapsed", common.PrettyDuration(elapsedA), "scope", m.scope, "db", common.PrettyDuration(m.fs.Metrics()), "blocks", len(m.fs.Blocks()), "txs", m.fs.Txs(), "files", len(m.fs.Files()), "root", m.fs.Root())
817817
m.fs.SkipPrint()
818818
}()
819819
}

0 commit comments

Comments
 (0)