Set lowest level logger (#403)

* set lowest log level will fire on console

* add missing logger

* Remove warn log level in config file

* update comment config file

Author: sukrawidhyawan

cmd/block/blockGenerator.go

@@ -161,6 +161,7 @@ func generateBlocks(numberOfBlocks int, blocksmithSecretPhrase, outputPath strin
 		blocksmith,
 		blockService,
 		nodeRegistrationService,
+		log.New(),
 	)
 	startTime := time.Now().UnixNano() / 1e6
 	fmt.Printf("generating %d blocks\n", numberOfBlocks)

common/interceptor/interceptor.go

@@ -58,7 +58,7 @@ func NewServerInterceptor(logger *logrus.Logger, ownerAddress string) grpc.Unary
 				case err != nil:
 					logger.WithFields(fields).Error(fmt.Sprint(err))
 				case errHandler != nil:
-					logger.WithFields(fields).Warning(errHandler)
+					logger.WithFields(fields).Error(errHandler)
 				default:
 					logger.WithFields(fields).Info("success")
 				}
@@ -119,7 +119,7 @@ func NewClientInterceptor(logger *logrus.Logger, ignoredErrors map[codes.Code]st
 				case errInvoker != nil:
 					statusCode, isKnownErr := status.FromError(errInvoker)
 					if !isKnownErr || (ignoredErrors[statusCode.Code()] == "") {
-						logger.WithFields(fields).Warning(fmt.Sprint(errInvoker))
+						logger.WithFields(fields).Error(fmt.Sprint(errInvoker))
 					}
 				default:
 					logger.WithFields(fields).Info("success")

common/util/logger.go

@@ -38,10 +38,11 @@ InitLogger is function that should be implemeneted with interceptor. That can ce
 */
 func InitLogger(path, filename string, levels []string) (*logrus.Logger, error) {
 	var (
-		logLevels []logrus.Level
-		logger    *logrus.Logger
-		err       error
-		logFile   *os.File
+		logLevels   []logrus.Level
+		lowestLevel logrus.Level
+		logger      *logrus.Logger
+		err         error
+		logFile     *os.File
 	)
 	_, err = os.Stat(path)
 	if err != nil && os.IsNotExist(err) {
@@ -69,6 +70,10 @@ func InitLogger(path, filename string, levels []string) (*logrus.Logger, error)
 		case "panic":
 			logLevels = append(logLevels, logrus.PanicLevel)
 		}
+		// lowestLevel will based on the list log level will use
+		if lowestLevel < logLevels[len(logLevels)-1] {
+			lowestLevel = logLevels[len(logLevels)-1]
+		}
 	}
 	if len(logLevels) < 1 {
 		logLevels = append(
@@ -84,6 +89,8 @@ func InitLogger(path, filename string, levels []string) (*logrus.Logger, error)
 		Writer:      logFile,
 		EntryLevels: logLevels,
 	})
+	// lowestLevel use to set lowest level will fire
+	logger.SetLevel(lowestLevel)
 
 	return logger, nil
 }

core/blockchainsync/blockchainSync.go

@@ -97,7 +97,7 @@ func (bss *Service) GetMoreBlocksThread(runNext chan bool) {
 }
 
 func (bss *Service) getMoreBlocks(runNext chan bool) {
-	log.Info("Get more blocks...")
+	bss.Logger.Info("Get more blocks...")
 	// notify observer about start of blockchain download of this specific chain
 
 	lastBlock, err := bss.BlockService.GetLastBlock()

core/smith/blockchainProcessor.go

@@ -36,6 +36,7 @@ type (
 		BlockService            service.BlockServiceInterface
 		NodeRegistrationService service.NodeRegistrationServiceInterface
 		LastBlockID             int64
+		Logger                  *log.Logger
 	}
 )
 
@@ -45,12 +46,14 @@ func NewBlockchainProcessor(
 	blocksmith *model.Blocksmith,
 	blockService service.BlockServiceInterface,
 	nodeRegistrationService service.NodeRegistrationServiceInterface,
+	logger *log.Logger,
 ) *BlockchainProcessor {
 	return &BlockchainProcessor{
 		Chaintype:               ct,
 		Generator:               blocksmith,
 		BlockService:            blockService,
 		NodeRegistrationService: nodeRegistrationService,
+		Logger:                  logger,
 	}
 }
 
@@ -62,10 +65,10 @@ func (bp *BlockchainProcessor) CalculateSmith(lastBlock *model.Block, generator
 	// since default balance was 1000 times higher than default ps
 	ps, err := bp.BlockService.GetParticipationScore(generator.NodePublicKey)
 	if ps == 0 {
-		log.Info("Node has participation score = 0. Either is not registered or has been expelled from node registry")
+		bp.Logger.Info("Node has participation score = 0. Either is not registered or has been expelled from node registry")
 	}
 	if err != nil {
-		log.Errorf("Participation score calculation: %s", err)
+		bp.Logger.Errorf("Participation score calculation: %s", err)
 		generator.Score = big.NewInt(0)
 	} else {
 		generator.Score = big.NewInt(ps / int64(constant.ScalarReceiptScore))
@@ -209,7 +212,7 @@ func (bp *BlockchainProcessor) SortBlocksmith(sortedBlocksmiths *[]model.Blocksm
 			var blocksmiths []model.Blocksmith
 			nextBlocksmiths, err := bp.BlockService.GetBlocksmiths(lastBlock)
 			if err != nil {
-				log.Errorf("SortBlocksmith: %s", err)
+				bp.Logger.Errorf("SortBlocksmith: %s", err)
 				return
 			}
 			// copy the nextBlocksmiths pointers array into an array of blocksmiths

core/smith/blockchainProcessor_test.go

@@ -6,6 +6,7 @@ import (
 	"reflect"
 	"testing"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/zoobc/zoobc-core/common/util"
 	coreUtil "github.com/zoobc/zoobc-core/core/util"
 
@@ -21,6 +22,7 @@ func TestNewBlockchainProcessor(t *testing.T) {
 		blocksmith              *model.Blocksmith
 		blockService            service.BlockServiceInterface
 		nodeRegistrationService service.NodeRegistrationServiceInterface
+		logger                  *log.Logger
 	}
 	tests := []struct {
 		name string
@@ -46,7 +48,12 @@ func TestNewBlockchainProcessor(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if got := NewBlockchainProcessor(
-				tt.args.ct, tt.args.blocksmith, tt.args.blockService, tt.args.nodeRegistrationService); !reflect.DeepEqual(got, tt.want) {
+				tt.args.ct,
+				tt.args.blocksmith,
+				tt.args.blockService,
+				tt.args.nodeRegistrationService,
+				tt.args.logger,
+			); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("NewBlockchainProcessor() = %v, want %v", got, tt.want)
 			}
 		})
@@ -212,6 +219,7 @@ func TestBlockchainProcessor_SortBlocksmith_01(t *testing.T) {
 			},
 			&mockBlockService{},
 			nil,
+			log.New(),
 		)
 		listener := bProcessor.SortBlocksmith(&sortedBlocksmiths)
 		listener.OnNotify(&model.Block{}, &chaintype.MainChain{})
@@ -274,6 +282,7 @@ func TestBlockchainProcessor_SortBlocksmith_02(t *testing.T) {
 			},
 			&mockBlockService{},
 			nil,
+			log.New(),
 		)
 		listener := bProcessor.SortBlocksmith(&sortedBlocksmiths)
 		listener.OnNotify(&model.Block{}, &chaintype.MainChain{})
@@ -338,6 +347,7 @@ func TestBlockchainProcessor_SortBlocksmith_03(t *testing.T) {
 			},
 			&mockBlockService{},
 			nil,
+			log.New(),
 		)
 		listener := bProcessor.SortBlocksmith(&sortedBlocksmiths)
 		listener.OnNotify(&model.Block{}, &chaintype.MainChain{})
@@ -412,6 +422,7 @@ func TestBlockchainProcessor_SortBlocksmith_fail(t *testing.T) {
 			},
 			&mockBlockServiceFail{},
 			nil,
+			log.New(),
 		)
 		listener := bProcessor.SortBlocksmith(&sortedBlocksmiths)
 		listener.OnNotify(&model.Block{

main.go

@@ -353,6 +353,7 @@ func startMainchain(mainchainSyncChannel chan bool) {
 		model.NewBlocksmith(nodeSecretPhrase, util.GetPublicKeyFromSeed(nodeSecretPhrase)),
 		mainchainBlockService,
 		nodeRegistrationService,
+		loggerCoreService,
 	)
 
 	if !mainchainBlockService.CheckGenesis() { // Add genesis if not exist

resource/config.toml

@@ -21,4 +21,5 @@ ownerAccountAddress = "BCZEGOb3WNx3fDOVf9ZS4EjvOIv_UeW4TVBQJ_6tHKlE"
 smithing=true
 proofOfOwnershipReqTimeoutSec = 2
 # Log Levels
-logLevels=["warn", "fatal", "error", "panic"]
+# Available log level: info, warn, error, fatal, panic
+logLevels=["fatal", "error", "panic"]

resource/config2.toml

@@ -20,4 +20,5 @@ ownerAccountAddress = "OnEYzI-EMV6UTfoUEzpQUjkSlnqB82-SyRN7469lJTWH"
 # smithing=true
 proofOfOwnershipReqTimeoutSec = 1
 # Log Levels
-logLevels=["warn", "fatal", "error", "panic"]
+# Available log level: info, warn, error, fatal, panic
+logLevels=["fatal", "error", "panic"]

resource/config3.toml

@@ -19,4 +19,5 @@ ownerAccountAddress = "BCZKLvgUYZ1KKx-jtF9KoJskjVPvB9jpIjfzzI6zDW0J"
 
 proofOfOwnershipReqTimeoutSec = 1
 # Log Levels
-logLevels=["warn", "fatal", "error", "panic"]
+# Available log level: info, warn, error, fatal, panic
+logLevels=["fatal", "error", "panic"]

resource/config4.toml

@@ -18,4 +18,5 @@ ownerAccountAddress = "nK_ouxdDDwuJiogiDAi_zs1LqeN7f5ZsXbFtXGqGc0Pd"
 
 proofOfOwnershipReqTimeoutSec = 1
 # Log Levels
-logLevels=["warn", "fatal", "error", "panic"]
+# Available log level: info, warn, error, fatal, panic
+logLevels=["fatal", "error", "panic"]