database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logutil: InitLogger as a more abstract method, deprecated InitZapLogger (#25381)

Browse Source
This commit is contained in:
tison
2021-06-15 10:54:37 +08:00
committed by GitHub
parent a45b3aaa2b
commit bca2f7250f
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/benchdb/main.go
View File

@ -54,7 +54,7 @@ var (
func main() {
flag.Parse()
flag.PrintDefaults()
err := logutil.InitZapLogger(logutil.NewLogConfig(*logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
err := logutil.InitLogger(logutil.NewLogConfig(*logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
terror.MustNil(err)
err = store.Register("tikv", driver.TiKVDriver{})
terror.MustNil(err)

2
cmd/benchfilesort/main.go
View File

@ -381,7 +381,7 @@ func driveRunCmd() {
}
func init() {
err := logutil.InitZapLogger(logutil.NewLogConfig(logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
err := logutil.InitLogger(logutil.NewLogConfig(logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
terror.MustNil(err)
cwd, err1 := os.Getwd()
terror.MustNil(err1)

2
cmd/explaintest/main.go
View File

@ -611,7 +611,7 @@ func openDBWithRetry(driverName, dataSourceName string) (mdb *sql.DB, err error)
func main() {
flag.Parse()
err := logutil.InitZapLogger(logutil.NewLogConfig(logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
err := logutil.InitLogger(logutil.NewLogConfig(logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
if err != nil {
panic("init logger fail, " + err.Error())
}

2
server/server_test.go
View File

@ -58,7 +58,7 @@ func TestT(t *testing.T) {
}
CustomVerboseFlag = true
logLevel := os.Getenv("log_level")
err := logutil.InitZapLogger(logutil.NewLogConfig(logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
err := logutil.InitLogger(logutil.NewLogConfig(logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
if err != nil {
t.Fatal(err)
}

4
tidb-server/main.go
View File

@ -306,7 +306,7 @@ func setupBinlogClient() {
terror.MustNil(err)
err = pumpcli.InitLogger(cfg.Log.ToLogConfig())
err = logutil.InitLogger(cfg.Log.ToLogConfig())
terror.MustNil(err)
binloginfo.SetPumpsClient(client)
@ -588,7 +588,7 @@ func setGlobalVars() {
func setupLog() {
cfg := config.GetGlobalConfig()
err := logutil.InitZapLogger(cfg.Log.ToLogConfig())
err := logutil.InitLogger(cfg.Log.ToLogConfig())
terror.MustNil(err)
// trigger internal http(s) client init.

15
util/logutil/log.go
View File

@ -94,16 +94,11 @@ const (
OldSlowLogTimeFormat = "2006-01-02-15:04:05.999999999 -0700"
)
// SlowQueryLogger is used to log slow query, InitZapLogger will modify it according to config file.
// SlowQueryLogger is used to log slow query, InitLogger will modify it according to config file.
var SlowQueryLogger = log.L()
// InitLogger delegates to InitZapLogger. Keeping it here for historical reason.
// InitLogger initializes a logger with cfg.
func InitLogger(cfg *LogConfig) error {
return InitZapLogger(cfg)
}
// InitZapLogger initializes a zap logger with cfg.
func InitZapLogger(cfg *LogConfig) error {
gl, props, err := log.InitLogger(&cfg.Config, zap.AddStacktrace(zapcore.FatalLevel))
if err != nil {
return errors.Trace(err)
@ -127,6 +122,12 @@ func InitZapLogger(cfg *LogConfig) error {
return nil
}
// InitZapLogger is delegated to InitLogger.
// Deprecated: prefer InitLogger
func InitZapLogger(cfg *LogConfig) error {
return InitLogger(cfg)
}
// SetLevel sets the zap logger's level.
func SetLevel(level string) error {
l := zap.NewAtomicLevel()

6
util/logutil/log_test.go
View File

@ -66,14 +66,14 @@ func (s *testLogSuite) TestZapLoggerWithKeys(c *C) {
fileCfg := FileLogConfig{log.FileLogConfig{Filename: "zap_log", MaxSize: 4096}}
conf := NewLogConfig("info", DefaultLogFormat, "", fileCfg, false)
err := InitZapLogger(conf)
err := InitLogger(conf)
c.Assert(err, IsNil)
connID := uint64(123)
ctx := WithConnID(context.Background(), connID)
s.testZapLogger(ctx, c, fileCfg.Filename, zapLogWithConnIDPattern)
os.Remove(fileCfg.Filename)
err = InitZapLogger(conf)
err = InitLogger(conf)
c.Assert(err, IsNil)
key := "ctxKey"
val := "ctxValue"
@ -108,7 +108,7 @@ func (s *testLogSuite) testZapLogger(ctx context.Context, c *C, fileName, patter
func (s *testLogSuite) TestSetLevel(c *C) {
conf := NewLogConfig("info", DefaultLogFormat, "", EmptyFileLogConfig, false)
err := InitZapLogger(conf)
err := InitLogger(conf)
c.Assert(err, IsNil)
c.Assert(log.GetLevel(), Equals, zap.InfoLevel)