Feature/remove not used file (#987)

* feat(cluster,dm): set flags variables in flags module * chore(*cluster/template): rm not used dm/prometheus.go * refact(flags/debug): use localdata.Envxxx instead hard-write
pingcap · Dec 15, 2020 · d36a601 · d36a601
1 parent 32d6f10
commit d36a601
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 112 deletions.
diff --git a/cmd/env.go b/cmd/env.go
@@ -31,6 +31,7 @@ var envList = []string{
 	localdata.EnvNameKeepSourceTarget,
 	localdata.EnvNameMirrorSyncScript,
 	localdata.EnvNameLogPath,
+	localdata.EnvNameDebug,
 }
 
 func newEnvCmd() *cobra.Command {

diff --git a/components/cluster/command/root.go b/components/cluster/command/root.go
@@ -77,8 +77,6 @@ func init() {
 
 	colorutil.AddColorFunctionsForCobra()
 
-	// Initialize the global variables
-	flags.ShowBacktrace = len(os.Getenv("TIUP_BACKTRACE")) > 0
 	cobra.EnableCommandSorting = false
 
 	nativeEnvVar := strings.ToLower(os.Getenv(localdata.EnvNameNativeSSHClient))

diff --git a/components/dm/command/root.go b/components/dm/command/root.go
@@ -23,7 +23,6 @@ import (
 	"github.com/pingcap/tiup/components/dm/spec"
 	"github.com/pingcap/tiup/pkg/cliutil"
 	"github.com/pingcap/tiup/pkg/cluster/executor"
-	"github.com/pingcap/tiup/pkg/cluster/flags"
 	"github.com/pingcap/tiup/pkg/cluster/manager"
 	operator "github.com/pingcap/tiup/pkg/cluster/operation"
 	cspec "github.com/pingcap/tiup/pkg/cluster/spec"
@@ -54,8 +53,6 @@ func init() {
 
 	colorutil.AddColorFunctionsForCobra()
 
-	// Initialize the global variables
-	flags.ShowBacktrace = len(os.Getenv("TIUP_BACKTRACE")) > 0
 	cobra.EnableCommandSorting = false
 
 	nativeEnvVar := strings.ToLower(os.Getenv(localdata.EnvNameNativeSSHClient))

diff --git a/pkg/cluster/flags/debug.go b/pkg/cluster/flags/debug.go
@@ -15,16 +15,16 @@ package flags
 
 import (
 	"os"
+
+	"github.com/pingcap/tiup/pkg/localdata"
 )
 
 // Global flags
 var (
-	ShowBacktrace = false
-	DebugMode     = false
+	DebugMode = false
 )
 
 func init() {
-	if s := os.Getenv("TIUP_CLUSTER_DEBUG"); s == "enable" {
-		DebugMode = true
-	}
+	val := os.Getenv(localdata.EnvNameDebug)
+	DebugMode = val == "enable" || val == "enabled"
 }
diff --git a/pkg/cluster/template/config/dm/prometheus.go b/pkg/cluster/template/config/dm/prometheus.go
diff --git a/pkg/localdata/constant.go b/pkg/localdata/constant.go
@@ -90,6 +90,9 @@ const (
 	// EnvNameLogPath is the variable name by which user can write the log files into
 	EnvNameLogPath = "TIUP_LOG_PATH"
 
+	// EnvNameDebug is the variable name by which user can set tiup runs in debug mode(eg. print panic logs)
+	EnvNameDebug = "TIUP_CLUSTER_DEBUG"
+
 	// MetaFilename represents the process meta file name
 	MetaFilename = "tiup_process_meta"
 )