From 2a6d50470dc9d05b70d3bd1133b9bba22f42a265 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Thu, 16 Nov 2017 05:44:50 -0800
Subject: [PATCH] *: use grpclog.NewLoggerV2

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
---
 etcdctl/ctlv3/command/global.go                 | 6 ++++--
 tools/benchmark/cmd/util.go                     | 5 +++--
 tools/functional-tester/etcd-tester/stresser.go | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go
index 616d32e21..39ab96453 100644
--- a/etcdctl/ctlv3/command/global.go
+++ b/etcdctl/ctlv3/command/global.go
@@ -19,7 +19,6 @@ import (
 	"errors"
 	"io"
 	"io/ioutil"
-	"log"
 	"os"
 	"strings"
 	"time"
@@ -29,6 +28,7 @@ import (
 	"github.com/coreos/etcd/pkg/flags"
 	"github.com/coreos/etcd/pkg/transport"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/grpclog"
 )
 
 // GlobalFlags are flags that defined globally
@@ -88,7 +88,9 @@ func mustClientFromCmd(cmd *cobra.Command) *clientv3.Client {
 		ExitWithError(ExitError, derr)
 	}
 	if debug {
-		clientv3.SetLogger(log.New(os.Stderr, "grpc: ", 0))
+		clientv3.SetLogger(grpclog.NewLoggerV2WithVerbosity(os.Stderr, os.Stderr, os.Stderr, 4))
+	} else {
+		clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
 	}
 
 	endpoints, err := cmd.Flags().GetStringSlice("endpoints")
diff --git a/tools/benchmark/cmd/util.go b/tools/benchmark/cmd/util.go
index a5872913d..4af0b7acd 100644
--- a/tools/benchmark/cmd/util.go
+++ b/tools/benchmark/cmd/util.go
@@ -17,13 +17,14 @@ package cmd
 import (
 	"crypto/rand"
 	"fmt"
-	"log"
 	"os"
 	"strings"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/pkg/report"
+
 	"golang.org/x/net/context"
+	"google.golang.org/grpc/grpclog"
 )
 
 var (
@@ -98,7 +99,7 @@ func mustCreateConn() *clientv3.Client {
 		return mustCreateConn()
 	}
 
-	clientv3.SetLogger(log.New(os.Stderr, "grpc", 0))
+	clientv3.SetLogger(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr))
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "dial error: %v\n", err)
diff --git a/tools/functional-tester/etcd-tester/stresser.go b/tools/functional-tester/etcd-tester/stresser.go
index 30e8d47d7..4c5cdcef6 100644
--- a/tools/functional-tester/etcd-tester/stresser.go
+++ b/tools/functional-tester/etcd-tester/stresser.go
@@ -16,6 +16,7 @@ package main
 
 import (
 	"fmt"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -24,7 +25,7 @@ import (
 	"google.golang.org/grpc/grpclog"
 )
 
-func init() { grpclog.SetLogger(plog) }
+func init() { grpclog.SetLoggerV2(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr)) }
 
 type Stresser interface {
 	// Stress starts to stress the etcd cluster