pkg, tools: improve the log message (tikv#1636)

* pkg,tools: improve the log message

Signed-off-by: nolouch <nolouch@gmail.com>

Gopkg.toml

@@ -45,8 +45,8 @@
   revision = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/pingcap/log"
+  branch = "master"
 
 [[constraint]]
   name = "go.uber.org/zap"

pkg/etcdutil/etcdutil.go

@@ -16,7 +16,6 @@ package etcdutil
 import (
 	"context"
 	"crypto/tls"
-	"fmt"
 	"net/http"
 	"time"
 
@@ -25,6 +24,7 @@ import (
 	"github.com/coreos/etcd/pkg/types"
 	log "github.com/pingcap/log"
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
 )
 
 const (
@@ -60,7 +60,7 @@ func CheckClusterID(localClusterID types.ID, um types.URLsMap, tlsConfig *tls.Co
 		trp.CloseIdleConnections()
 		if gerr != nil {
 			// Do not return error, because other members may be not ready.
-			log.Error(fmt.Sprintf("%v", gerr))
+			log.Error("failed to get cluster from remote", zap.Error(gerr))
 			continue
 		}
 

pkg/tempurl/tempurl.go

@@ -20,6 +20,7 @@ import (
 	"time"
 
 	log "github.com/pingcap/log"
+	"go.uber.org/zap"
 )
 
 var (
@@ -42,12 +43,12 @@ func Alloc() string {
 func tryAllocTestURL() string {
 	l, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
-		log.Fatal(fmt.Sprintf("%v", err))
+		log.Fatal("listen failed", zap.Error(err))
 	}
 	addr := fmt.Sprintf("http://%s", l.Addr())
 	err = l.Close()
 	if err != nil {
-		log.Fatal(fmt.Sprintf("%v", err))
+		log.Fatal("close failed", zap.Error(err))
 	}
 
 	testAddrMutex.Lock()

server/api/redirector.go

@@ -14,7 +14,6 @@
 package api
 
 import (
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -95,21 +94,21 @@ func (p *customReverseProxies) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 		resp, err := p.client.Do(r)
 		if err != nil {
-			log.Error(fmt.Sprintf("%+v", err))
+			log.Error("request failed", zap.Error(err))
 			continue
 		}
 
 		b, err := ioutil.ReadAll(resp.Body)
 		resp.Body.Close()
 		if err != nil {
-			log.Error(fmt.Sprintf("%+v", err))
+			log.Error("request failed", zap.Error(err))
 			continue
 		}
 
 		copyHeader(w.Header(), resp.Header)
 		w.WriteHeader(resp.StatusCode)
 		if _, err := w.Write(b); err != nil {
-			log.Error(fmt.Sprintf("%+v", err))
+			log.Error("write failed", zap.Error(err))
 			continue
 		}
 

server/config.go

@@ -186,6 +186,8 @@ const (
 	defaultHeartbeatStreamRebindInterval = time.Minute
 
 	defaultLeaderPriorityCheckInterval = time.Minute
+
+	defaultDisableErrorVerbose = true
 )
 
 func adjustString(v *string, defValue string) {
@@ -395,6 +397,8 @@ func (c *Config) Adjust(meta *toml.MetaData) error {
 		return err
 	}
 
+	c.adjustLog(configMetaData.Child("log"))
+
 	adjustDuration(&c.heartbeatStreamBindInterval, defaultHeartbeatStreamRebindInterval)
 
 	adjustDuration(&c.leaderPriorityCheckInterval, defaultLeaderPriorityCheckInterval)
@@ -405,6 +409,12 @@ func (c *Config) Adjust(meta *toml.MetaData) error {
 	return nil
 }
 
+func (c *Config) adjustLog(meta *configMetaData) {
+	if !meta.IsDefined("disable-error-verbose") {
+		c.Log.DisableErrorVerbose = defaultDisableErrorVerbose
+	}
+}
+
 func (c *Config) clone() *Config {
 	cfg := &Config{}
 	*cfg = *c

tools/pd-tso-bench/main.go

@@ -26,6 +26,7 @@ import (
 	log "github.com/pingcap/log"
 	pd "github.com/pingcap/pd/client"
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
 )
 
 var (
@@ -55,7 +56,7 @@ func main() {
 	for i := 0; i < *concurrency; i++ {
 		_, _, err = pdCli.GetTS(ctx)
 		if err != nil {
-			log.Fatal(fmt.Sprintf("%v", err))
+			log.Fatal("get tso failed", zap.Error(err))
 		}
 	}