From 1ea657430a058e5a161534838ad3091b28b51a98 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 31 Aug 2022 10:50:17 +0800 Subject: [PATCH] :art: boot log --- kernel/model/conf.go | 8 ++------ kernel/treenode/blocktree.go | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 31e15186e..82ed35f03 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -491,8 +491,7 @@ func (conf *AppConf) Language(num int) (ret string) { func InitBoxes() { initialized := false - blockCount := 0 - if 1 > len(treenode.GetBlockTrees()) { + if 1 > treenode.CountBlocks() { if gulu.File.IsExist(util.BlockTreePath) { util.IncBootProgress(20, "Reading block trees...") go func() { @@ -523,14 +522,11 @@ func InitBoxes() { treenode.SaveBlockTree() } - blocktrees := treenode.GetBlockTrees() - blockCount = len(blocktrees) - var dbSize string if dbFile, err := os.Stat(util.DBPath); nil == err { dbSize = humanize.Bytes(uint64(dbFile.Size())) } - logging.LogInfof("database size [%s], block count [%d]", dbSize, blockCount) + logging.LogInfof("database size [%s], tree/block count [%d/%d]", dbSize, treenode.CountTrees(), treenode.CountBlocks()) } func IsSubscriber() bool { diff --git a/kernel/treenode/blocktree.go b/kernel/treenode/blocktree.go index 455484c6f..fe9f50d84 100644 --- a/kernel/treenode/blocktree.go +++ b/kernel/treenode/blocktree.go @@ -56,8 +56,8 @@ func CountTrees() (ret int) { return } -func GetBlockTrees() map[string]*BlockTree { - return blockTrees +func CountBlocks() (ret int) { + return len(blockTrees) } func GetBlockTreeRootByPath(boxID, path string) *BlockTree {