*: use the unified log format for the remaining packages (pingcap#9743)

ti-chi-bot · Mar 22, 2019 · b78490e · b78490e
1 parent facadf7
commit b78490e
Show file tree

Hide file tree

Showing 16 changed files with 136 additions and 100 deletions.
diff --git a/cmd/benchdb/main.go b/cmd/benchdb/main.go
@@ -22,12 +22,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pingcap/log"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/session"
 	"github.com/pingcap/tidb/store"
 	"github.com/pingcap/tidb/store/tikv"
 	"github.com/pingcap/tidb/util/logutil"
-	log "github.com/sirupsen/logrus"
+	"go.uber.org/zap"
 )
 
 var (
@@ -55,7 +56,7 @@ var (
 func main() {
 	flag.Parse()
 	flag.PrintDefaults()
-	err := logutil.InitLogger(logutil.NewLogConfig(*logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
+	err := logutil.InitZapLogger(logutil.NewLogConfig(*logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
 	terror.MustNil(err)
 	err = store.Register("tikv", tikv.Driver{})
 	terror.MustNil(err)
@@ -111,7 +112,7 @@ func newBenchDB() *benchDB {
 func (ut *benchDB) mustExec(sql string) {
 	rss, err := ut.session.Execute(context.Background(), sql)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal(err.Error())
 	}
 	if len(rss) > 0 {
 		ctx := context.Background()
@@ -120,7 +121,7 @@ func (ut *benchDB) mustExec(sql string) {
 		for {
 			err := rs.Next(ctx, req)
 			if err != nil {
-				log.Fatal(err)
+				log.Fatal(err.Error())
 			}
 			if req.NumRows() == 0 {
 				break
@@ -140,21 +141,21 @@ func (ut *benchDB) mustParseWork(work string) (name string, spec string) {
 func (ut *benchDB) mustParseInt(s string) int {
 	i, err := strconv.Atoi(s)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal(err.Error())
 	}
 	return i
 }
 
 func (ut *benchDB) mustParseRange(s string) (start, end int) {
 	strs := strings.Split(s, "_")
 	if len(strs) != 2 {
-		log.Fatal("invalid range " + s)
+		log.Fatal("parse range failed", zap.String("invalid range", s))
 	}
 	startStr, endStr := strs[0], strs[1]
 	start = ut.mustParseInt(startStr)
 	end = ut.mustParseInt(endStr)
 	if start < 0 || end < start {
-		log.Fatal("invalid range " + s)
+		log.Fatal("parse range failed", zap.String("invalid range", s))
 	}
 	return
 }

diff --git a/cmd/benchfilesort/main.go b/cmd/benchfilesort/main.go
@@ -25,13 +25,13 @@ import (
 	"time"
 
 	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/codec"
 	"github.com/pingcap/tidb/util/filesort"
 	"github.com/pingcap/tidb/util/logutil"
-	log "github.com/sirupsen/logrus"
 )
 
 type comparableRow struct {
@@ -264,19 +264,19 @@ func driveGenCmd() {
 	terror.MustNil(err)
 	// Sanity checks
 	if keySize <= 0 {
-		log.Fatal(errors.New("key size must be positive"))
+		log.Fatal("key size must be positive")
 	}
 	if valSize <= 0 {
-		log.Fatal(errors.New("value size must be positive"))
+		log.Fatal("value size must be positive")
 	}
 	if scale <= 0 {
-		log.Fatal(errors.New("scale must be positive"))
+		log.Fatal("scale must be positive")
 	}
 	if _, err = os.Stat(tmpDir); err != nil {
 		if os.IsNotExist(err) {
-			log.Fatal(errors.New("tmpDir does not exist"))
+			log.Fatal("tmpDir does not exist")
 		}
-		log.Fatal(err)
+		log.Fatal(err.Error())
 	}
 
 	cLog("Generating...")
@@ -294,20 +294,20 @@ func driveRunCmd() {
 	terror.MustNil(err)
 	// Sanity checks
 	if bufSize <= 0 {
-		log.Fatal(errors.New("buffer size must be positive"))
+		log.Fatal("buffer size must be positive")
 	}
 	if nWorkers <= 0 {
-		log.Fatal(errors.New("the number of workers must be positive"))
+		log.Fatal("the number of workers must be positive")
 	}
 	if inputRatio < 0 || inputRatio > 100 {
-		log.Fatal(errors.New("input ratio must between 0 and 100 (inclusive)"))
+		log.Fatal("input ratio must between 0 and 100 (inclusive)")
 	}
 	if outputRatio < 0 || outputRatio > 100 {
-		log.Fatal(errors.New("output ratio must between 0 and 100 (inclusive)"))
+		log.Fatal("output ratio must between 0 and 100 (inclusive)")
 	}
 	if _, err = os.Stat(tmpDir); err != nil {
 		if os.IsNotExist(err) {
-			log.Fatal(errors.New("tmpDir does not exist"))
+			log.Fatal("tmpDir does not exist")
 		}
 		terror.MustNil(err)
 	}
@@ -382,7 +382,7 @@ func driveRunCmd() {
 }
 
 func init() {
-	err := logutil.InitLogger(logutil.NewLogConfig(logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
+	err := logutil.InitZapLogger(logutil.NewLogConfig(logLevel, logutil.DefaultLogFormat, "", logutil.EmptyFileLogConfig, false))
 	terror.MustNil(err)
 	cwd, err1 := os.Getwd()
 	terror.MustNil(err1)

diff --git a/cmd/benchkv/main.go b/cmd/benchkv/main.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"go.uber.org/zap"
 	"io/ioutil"
 	"net/http"
 	_ "net/http/pprof"
@@ -25,11 +26,11 @@ import (
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/store/tikv"
 	"github.com/prometheus/client_golang/prometheus"
-	log "github.com/sirupsen/logrus"
 )
 
 var (
@@ -100,7 +101,7 @@ func batchRW(value []byte) {
 				k := base*i + j
 				txn, err := store.Begin()
 				if err != nil {
-					log.Fatal(err)
+					log.Fatal(err.Error())
 				}
 				key := fmt.Sprintf("key_%d", k)
 				err = txn.Set([]byte(key), value)
@@ -120,7 +121,7 @@ func batchRW(value []byte) {
 
 func main() {
 	flag.Parse()
-	log.SetLevel(log.ErrorLevel)
+	log.SetLevel(zap.ErrorLevel)
 	Init()
 
 	value := make([]byte, *valueSize)

diff --git a/cmd/benchraw/main.go b/cmd/benchraw/main.go
@@ -23,10 +23,11 @@ import (
 	"time"
 
 	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/config"
 	"github.com/pingcap/tidb/store/tikv"
-	log "github.com/sirupsen/logrus"
+	"go.uber.org/zap"
 )
 
 var (
@@ -47,7 +48,7 @@ func batchRawPut(value []byte) {
 		ClusterSSLKey:  *sslKey,
 	})
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal(err.Error())
 	}
 
 	wg := sync.WaitGroup{}
@@ -62,7 +63,7 @@ func batchRawPut(value []byte) {
 				key := fmt.Sprintf("key_%d", k)
 				err = cli.Put([]byte(key), value)
 				if err != nil {
-					log.Fatal(errors.ErrorStack(err))
+					log.Fatal("put failed", zap.Error(err))
 				}
 			}
 		}(i)
@@ -72,7 +73,7 @@ func batchRawPut(value []byte) {
 
 func main() {
 	flag.Parse()
-	log.SetLevel(log.WarnLevel)
+	log.SetLevel(zap.WarnLevel)
 	go func() {
 		err := http.ListenAndServe(":9191", nil)
 		terror.Log(errors.Trace(err))