From 18b1d1ff6577228f90b48847f79cb100fcf33ca2 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 6 Apr 2018 11:05:21 -0700 Subject: [PATCH] ctlv3: update logger for snapshot command Signed-off-by: Gyuho Lee --- etcdctl/ctlv3/command/snapshot_command.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etcdctl/ctlv3/command/snapshot_command.go b/etcdctl/ctlv3/command/snapshot_command.go index 3ce5b1f8a..c48045d26 100644 --- a/etcdctl/ctlv3/command/snapshot_command.go +++ b/etcdctl/ctlv3/command/snapshot_command.go @@ -20,11 +20,11 @@ import ( "path/filepath" "strings" - "github.com/coreos/etcd/pkg/logutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/snapshot" "github.com/spf13/cobra" + "go.uber.org/zap" ) const ( @@ -96,13 +96,13 @@ func snapshotSaveCommandFunc(cmd *cobra.Command, args []string) { ExitWithError(ExitBadArgs, err) } - lg := logutil.NewDiscardLogger() debug, err := cmd.Flags().GetBool("debug") if err != nil { ExitWithError(ExitError, err) } + lg := zap.NewNop() if debug { - lg = logutil.NewPackageLogger("github.com/coreos/etcd", "snapshot") + lg = zap.NewExample() } sp := snapshot.NewV3(mustClientFromCmd(cmd), lg) @@ -120,13 +120,13 @@ func snapshotStatusCommandFunc(cmd *cobra.Command, args []string) { } initDisplayFromCmd(cmd) - lg := logutil.NewDiscardLogger() debug, err := cmd.Flags().GetBool("debug") if err != nil { ExitWithError(ExitError, err) } + lg := zap.NewNop() if debug { - lg = logutil.NewPackageLogger("github.com/coreos/etcd", "snapshot") + lg = zap.NewExample() } sp := snapshot.NewV3(nil, lg) @@ -158,13 +158,13 @@ func snapshotRestoreCommandFunc(cmd *cobra.Command, args []string) { walDir = filepath.Join(dataDir, "member", "wal") } - lg := logutil.NewDiscardLogger() debug, err := cmd.Flags().GetBool("debug") if err != nil { ExitWithError(ExitError, err) } + lg := zap.NewNop() if debug { - lg = logutil.NewPackageLogger("github.com/coreos/etcd", "snapshot") + lg = zap.NewExample() } sp := snapshot.NewV3(nil, lg)