fix enabling colorized output by default

NethermindEth · May 12, 2023 · 663e24a · 663e24a
1 parent 677c3d4
commit 663e24a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/cmd/juno/juno.go b/cmd/juno/juno.go
@@ -37,7 +37,7 @@ const (
 	defaultRPCPort = uint16(6060)
 	defaultDBPath  = ""
 	defaultPprof   = false
-	defaultColor   = false
+	defaultColor   = true
 
 	configFlagUsage   = "The yaml configuration file."
 	logLevelFlagUsage = "Options: debug, info, warn, error."
@@ -46,7 +46,7 @@ const (
 	dbPathUsage  = "Location of the database files."
 	networkUsage = "Options: mainnet, goerli, goerli2, integration."
 	pprofUsage   = "Enables the pprof server and listens on port 9080."
-	colorUsage   = "Enables colorized outputs (ANSI Escape Codes)."
+	colorUsage   = "Uses --color=false command to disable colorized outputs (ANSI Escape Codes)."
 )
 
 var Version string

diff --git a/node/node.go b/node/node.go
@@ -150,7 +150,7 @@ func makeHTTP(port uint16, rpcHandler *rpc.Handler, log utils.SimpleLogger) *jso
 func (n *Node) Run(ctx context.Context) {
 	n.log.Infow("Starting Juno...", "config", fmt.Sprintf("%+v", *n.cfg))
 
-	dbLog, err := utils.NewZapLogger(utils.ERROR, false)
+	dbLog, err := utils.NewZapLogger(utils.ERROR, n.cfg.Color)
 	if err != nil {
 		n.log.Errorw("Error creating DB logger", "err", err)
 		return

diff --git a/utils/log.go b/utils/log.go
@@ -94,9 +94,8 @@ func NewNopZapLogger() *ZapLogger {
 func NewZapLogger(logLevel LogLevel, color bool) (*ZapLogger, error) {
 	config := zap.NewProductionConfig()
 	config.Encoding = "console"
-	if color {
-		config.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	} else {
+	config.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
+	if !color {
 		config.EncoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
 	}
 	config.EncoderConfig.EncodeTime = func(t time.Time, enc zapcore.PrimitiveArrayEncoder) {