From 27d308e1733f1f2b4e9a4065914bf923e1c09d30 Mon Sep 17 00:00:00 2001
From: tangcong <tangcong506@gmail.com>
Date: Tue, 20 Oct 2020 21:56:06 +0800
Subject: [PATCH] embed: only log stream error with debug level

---
 embed/config_logging.go | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/embed/config_logging.go b/embed/config_logging.go
index 7886772e703..1b09092214c 100644
--- a/embed/config_logging.go
+++ b/embed/config_logging.go
@@ -17,6 +17,8 @@ package embed
 import (
 	"crypto/tls"
 	"fmt"
+	"io/ioutil"
+	"os"
 	"sync"
 
 	"go.etcd.io/etcd/pkg/v3/logutil"
@@ -107,10 +109,14 @@ func (cfg *Config) setupLogging() error {
 					grpcLogOnce.Do(func() {
 						// debug true, enable info, warning, error
 						// debug false, only discard info
-						var gl grpclog.LoggerV2
-						gl, err = logutil.NewGRPCLoggerV2(copied)
-						if err == nil {
-							grpclog.SetLoggerV2(gl)
+						if cfg.LogLevel == "debug" {
+							var gl grpclog.LoggerV2
+							gl, err = logutil.NewGRPCLoggerV2(copied)
+							if err == nil {
+								grpclog.SetLoggerV2(gl)
+							}
+						} else {
+							grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr))
 						}
 					})
 					return nil
@@ -154,7 +160,11 @@ func (cfg *Config) setupLogging() error {
 					c.loggerWriteSyncer = syncer
 
 					grpcLogOnce.Do(func() {
-						grpclog.SetLoggerV2(logutil.NewGRPCLoggerV2FromZapCore(cr, syncer))
+						if cfg.LogLevel == "debug" {
+							grpclog.SetLoggerV2(logutil.NewGRPCLoggerV2FromZapCore(cr, syncer))
+						} else {
+							grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr))
+						}
 					})
 					return nil
 				}