From 291f9d139ed2a3bf8dc72d523e16e0923a1dc853 Mon Sep 17 00:00:00 2001 From: Somefive Date: Wed, 15 Sep 2021 13:18:50 +0800 Subject: [PATCH] Fix: fix cli logging (#2298) --- references/a/preimport/preimport.go | 11 ++++++++--- references/cli/cli.go | 5 +++++ references/cli/cluster.go | 3 +++ references/cmd/cli/main.go | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/references/a/preimport/preimport.go b/references/a/preimport/preimport.go index 8a0d25d2b..035fb6a27 100644 --- a/references/a/preimport/preimport.go +++ b/references/a/preimport/preimport.go @@ -28,14 +28,19 @@ var _flagSet *flag.FlagSet // disable logging during import func init() { - log.L.Logger.SetLevel(logrus.PanicLevel) _flagSet = flag.CommandLine klog.InitFlags(_flagSet) + SuppressLogging() +} + +// SuppressLogging disable logging +func SuppressLogging() { + log.L.Logger.SetLevel(logrus.PanicLevel) _ = _flagSet.Set("v", "-1") } -// Start recover logging -func Start() { +// ResumeLogging enable logging +func ResumeLogging() { log.L.Logger.SetLevel(logrus.InfoLevel) _ = _flagSet.Set("v", "0") } diff --git a/references/cli/cli.go b/references/cli/cli.go index 9b0b3a50a..ddc4aecd8 100644 --- a/references/cli/cli.go +++ b/references/cli/cli.go @@ -29,6 +29,7 @@ import ( "github.com/oam-dev/kubevela/pkg/utils/common" "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/oam-dev/kubevela/pkg/utils/util" + "github.com/oam-dev/kubevela/references/a/preimport" "github.com/oam-dev/kubevela/references/cmd/cli/fake" "github.com/oam-dev/kubevela/version" ) @@ -68,6 +69,10 @@ func NewCommand() *cobra.Command { os.Exit(1) } + preimport.SuppressLogging() + _, _ = commandArgs.GetClient() + preimport.ResumeLogging() + cmds.AddCommand( // Getting Start NewInitCommand(commandArgs, ioStream), diff --git a/references/cli/cluster.go b/references/cli/cluster.go index 74b8e8df2..3c6ae08fe 100644 --- a/references/cli/cluster.go +++ b/references/cli/cluster.go @@ -38,6 +38,7 @@ import ( "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/utils/common" errors3 "github.com/oam-dev/kubevela/pkg/utils/errors" + "github.com/oam-dev/kubevela/references/a/preimport" ) const ( @@ -65,7 +66,9 @@ func ClusterCommandGroup(c common.Args) *cobra.Command { } c.Config.Wrap(multicluster.NewSecretModeMultiClusterRoundTripper) c.Client = nil + preimport.SuppressLogging() k8sClient, err := c.GetClient() + preimport.ResumeLogging() if err != nil { return errors.Wrapf(err, "failed to get k8s client") } diff --git a/references/cmd/cli/main.go b/references/cmd/cli/main.go index 1e5557762..342a2c628 100644 --- a/references/cmd/cli/main.go +++ b/references/cmd/cli/main.go @@ -26,7 +26,7 @@ import ( ) func main() { - preimport.Start() + preimport.ResumeLogging() rand.Seed(time.Now().UnixNano()) command := cli.NewCommand()