From 1936acfd073272008f1f3a8632832e9b65ea06c8 Mon Sep 17 00:00:00 2001
From: zc <zc2638@qq.com>
Date: Thu, 21 Jul 2022 10:42:03 +0800
Subject: [PATCH] adjust the configuration check sequence (#1467)

Signed-off-by: zc <zc2638@qq.com>
---
 cmd/dfcache/cmd/root.go   | 19 +++++++++----------
 cmd/dfget/cmd/daemon.go   | 19 +++++++++----------
 cmd/dfget/cmd/root.go     | 19 +++++++++----------
 cmd/manager/cmd/root.go   | 10 +++++-----
 cmd/scheduler/cmd/root.go | 10 +++++-----
 5 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/cmd/dfcache/cmd/root.go b/cmd/dfcache/cmd/root.go
index 57c3036c5..36e839de2 100644
--- a/cmd/dfcache/cmd/root.go
+++ b/cmd/dfcache/cmd/root.go
@@ -112,6 +112,15 @@ func initDfcacheDfpath(cfg *config.CacheOption) (dfpath.Dfpath, error) {
 
 // runDfcache does some init operations and starts to download.
 func runDfcacheSubcmd(cmdName string, args []string) error {
+	// Convert config
+	if err := dfcacheConfig.Convert(cmdName, args); err != nil {
+		return err
+	}
+	// Validate config
+	if err := dfcacheConfig.Validate(cmdName); err != nil {
+		return err
+	}
+
 	var (
 		daemonClient client.DaemonClient
 		err          error
@@ -129,16 +138,6 @@ func runDfcacheSubcmd(cmdName string, args []string) error {
 	}
 	logger.Infof("Version:\n%s", version.Version())
 
-	// Convert config
-	if err := dfcacheConfig.Convert(cmdName, args); err != nil {
-		return err
-	}
-
-	// Validate config
-	if err := dfcacheConfig.Validate(cmdName); err != nil {
-		return err
-	}
-
 	// Dfcache config values
 	s, _ := yaml.Marshal(dfcacheConfig)
 	logger.Infof("client dfcache configuration:\n%s", string(s))
diff --git a/cmd/dfget/cmd/daemon.go b/cmd/dfget/cmd/daemon.go
index 836bfe914..65bf06f27 100644
--- a/cmd/dfget/cmd/daemon.go
+++ b/cmd/dfget/cmd/daemon.go
@@ -55,6 +55,15 @@ it supports container engine, wget and other downloading tools through proxy fun
 	SilenceUsage:       true,
 	FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
 	RunE: func(cmd *cobra.Command, args []string) error {
+		// Convert config
+		if err := cfg.Convert(); err != nil {
+			return err
+		}
+		// Validate config
+		if err := cfg.Validate(); err != nil {
+			return err
+		}
+
 		// Initialize daemon dfpath
 		d, err := initDaemonDfpath(cfg)
 		if err != nil {
@@ -67,16 +76,6 @@ it supports container engine, wget and other downloading tools through proxy fun
 		}
 		logger.RedirectStdoutAndStderr(cfg.Console, path.Join(d.LogDir(), "daemon"))
 
-		// Convert config
-		if err := cfg.Convert(); err != nil {
-			return err
-		}
-
-		// Validate config
-		if err := cfg.Validate(); err != nil {
-			return err
-		}
-
 		return runDaemon(d)
 	},
 }
diff --git a/cmd/dfget/cmd/root.go b/cmd/dfget/cmd/root.go
index e062910d8..8c6a02d68 100644
--- a/cmd/dfget/cmd/root.go
+++ b/cmd/dfget/cmd/root.go
@@ -69,6 +69,15 @@ var rootCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		start := time.Now()
 
+		// Convert config
+		if err := dfgetConfig.Convert(args); err != nil {
+			return err
+		}
+		// Validate config
+		if err := dfgetConfig.Validate(); err != nil {
+			return err
+		}
+
 		// Initialize daemon dfpath
 		d, err := initDfgetDfpath(dfgetConfig)
 		if err != nil {
@@ -83,16 +92,6 @@ var rootCmd = &cobra.Command{
 		// update plugin directory
 		source.UpdatePluginDir(d.PluginDir())
 
-		// Convert config
-		if err := dfgetConfig.Convert(args); err != nil {
-			return err
-		}
-
-		// Validate config
-		if err := dfgetConfig.Validate(); err != nil {
-			return err
-		}
-
 		fmt.Printf("--%s--  %s\n", start.Format("2006-01-02 15:04:05"), dfgetConfig.URL)
 		fmt.Printf("dfget version: %s\n", version.GitVersion)
 		fmt.Printf("current user: %s, default peer ip: %s\n", basic.Username, ip.IPv4)
diff --git a/cmd/manager/cmd/root.go b/cmd/manager/cmd/root.go
index 5aced092d..91825d182 100644
--- a/cmd/manager/cmd/root.go
+++ b/cmd/manager/cmd/root.go
@@ -46,6 +46,11 @@ for managing schedulers and seed peers, offering http apis and portal, etc.`,
 	DisableAutoGenTag: true,
 	SilenceUsage:      true,
 	RunE: func(cmd *cobra.Command, args []string) error {
+		// Validate config
+		if err := cfg.Validate(); err != nil {
+			return err
+		}
+
 		// Initialize dfpath
 		d, err := initDfpath(cfg.Server)
 		if err != nil {
@@ -58,11 +63,6 @@ for managing schedulers and seed peers, offering http apis and portal, etc.`,
 		}
 		logger.RedirectStdoutAndStderr(cfg.Console, path.Join(d.LogDir(), "manager"))
 
-		// Validate config
-		if err := cfg.Validate(); err != nil {
-			return err
-		}
-
 		return runManager(d)
 	},
 }
diff --git a/cmd/scheduler/cmd/root.go b/cmd/scheduler/cmd/root.go
index e6a0c9701..6ddaa3908 100644
--- a/cmd/scheduler/cmd/root.go
+++ b/cmd/scheduler/cmd/root.go
@@ -47,6 +47,11 @@ generate and maintain a P2P network during the download process, and push suitab
 	DisableAutoGenTag: true,
 	SilenceUsage:      true,
 	RunE: func(cmd *cobra.Command, args []string) error {
+		// Validate config
+		if err := cfg.Validate(); err != nil {
+			return err
+		}
+
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -62,11 +67,6 @@ generate and maintain a P2P network during the download process, and push suitab
 		}
 		logger.RedirectStdoutAndStderr(cfg.Console, path.Join(d.LogDir(), "scheduler"))
 
-		// Validate config
-		if err := cfg.Validate(); err != nil {
-			return err
-		}
-
 		return runScheduler(ctx, d)
 	},
 }