refactor: use PersistentPreRun set log level (#58)

* refactor: use PersistentPreRun set log level * refactor: use PersistentPreRun set log level
TencentBlueKing · Dec 28, 2023 · 52fd84a · 52fd84a
1 parent ef2942e
commit 52fd84a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/cmd/bscp/get.go b/cmd/bscp/get.go
@@ -18,7 +18,6 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slog"
 
 	"github.com/TencentBlueKing/bscp-go/client"
 	"github.com/TencentBlueKing/bscp-go/pkg/logger"
@@ -39,6 +38,15 @@ var (
 		Use:   "get",
 		Short: "Display app or kv resources",
 		Long:  `Display app or kv resources`,
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			// 设置日志等级, get 命令默认是 error
+			if logLevel == "" {
+				logLevel = "error"
+			}
+
+			level := logger.GetLevelByName(logLevel)
+			logger.SetLevel(level)
+		},
 	}
 
 	getAppCmd = &cobra.Command{
@@ -78,13 +86,6 @@ func init() {
 
 // runGetApp executes the get app command.
 func runGetApp(args []string) error {
-	// 设置日志等级, get 命令默认是 error
-	if logLevel == "" {
-		logLevel = "error"
-	}
-	level := logger.GetLevelByName(logLevel)
-	logger.SetLevel(level)
-
 	baseConf, err := initBaseConf()
 	if err != nil {
 		return err
@@ -191,8 +192,6 @@ func runGetKv(args []string) error {
 		return err
 	}
 
-	logger.SetLevel(slog.LevelError)
-
 	if appName == "" {
 		return fmt.Errorf("app must not be empty")
 	}

diff --git a/cmd/bscp/pull.go b/cmd/bscp/pull.go
@@ -48,10 +48,6 @@ func Pull(cmd *cobra.Command, args []string) {
 	// print bscp banner
 	fmt.Println(strings.TrimSpace(version.GetStartInfo()))
 
-	// 设置日志等级
-	level := logger.GetLevelByName(logLevel)
-	logger.SetLevel(level)
-
 	if err := initArgs(); err != nil {
 		logger.Error("init", logger.ErrAttr(err))
 		os.Exit(1)

diff --git a/cmd/bscp/root.go b/cmd/bscp/root.go
@@ -17,6 +17,8 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+
+	"github.com/TencentBlueKing/bscp-go/pkg/logger"
 )
 
 var (
@@ -25,6 +27,11 @@ var (
 		Use:   "bscp",
 		Short: "bscp is a command line tool for blueking service config platform",
 		Long:  `bscp is a command line tool for blueking service config platform`,
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			// 设置日志等级
+			level := logger.GetLevelByName(logLevel)
+			logger.SetLevel(level)
+		},
 	}
 )
 

diff --git a/cmd/bscp/watch.go b/cmd/bscp/watch.go
@@ -55,10 +55,6 @@ func Watch(cmd *cobra.Command, args []string) {
 	// print bscp banner
 	fmt.Println(strings.TrimSpace(version.GetStartInfo()))
 
-	// 设置日志等级
-	level := logger.GetLevelByName(logLevel)
-	logger.SetLevel(level)
-
 	if err := initArgs(); err != nil {
 		logger.Error("init args", logger.ErrAttr(err))
 		os.Exit(1)