*: add pingcap/log encoder as the default encoder (#62)

pingcap · Aug 31, 2022 · b49db9a · b49db9a
1 parent 8915c07
commit b49db9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/cmd/weirproxy/main.go b/cmd/weirproxy/main.go
@@ -57,6 +57,7 @@ func main() {
 
 		zapcfg := zap.NewDevelopmentConfig()
 		zapcfg.Encoding = cfg.Log.Encoder
+		zapcfg.DisableStacktrace = true
 		if level, err := zap.ParseAtomicLevel(cfg.Log.Level); err == nil {
 			zapcfg.Level = level
 		}

diff --git a/pkg/util/cmd/cmd.go b/pkg/util/cmd/cmd.go
@@ -22,6 +22,7 @@ import (
 	"sync"
 	"syscall"
 
+	"github.com/pingcap/log"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -32,6 +33,9 @@ var registerEncoders sync.Once
 func RunRootCommand(rootCmd *cobra.Command) {
 	registerEncoders.Do(func() {
 		zap.RegisterEncoder("tidb", func(cfg zapcore.EncoderConfig) (zapcore.Encoder, error) {
+			return log.NewTextEncoder(&log.Config{})
+		})
+		zap.RegisterEncoder("newtidb", func(cfg zapcore.EncoderConfig) (zapcore.Encoder, error) {
 			return NewTiDBEncoder(cfg), nil
 		})
 	})