none: some tiny code tidy-up (#34)

Signed-off-by: shane.xb.qian <shane.qian@foxmail.com>

cmd/datax/handler.go

@@ -32,8 +32,9 @@ func newMetricHandler(engine *datax.Engine) *metricHandler {
 
 func (h *metricHandler) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
 	w.WriteHeader(http.StatusOK)
-	if h.engine.Metrics().JSON() == nil {
+	j := h.engine.Metrics().JSON()
+	if j == nil {
 		return
 	}
-	w.Write([]byte(h.engine.Metrics().JSON().String()))
+	w.Write([]byte(j.String()))
 }

cmd/datax/main.go

@@ -24,9 +24,9 @@ import (
 
 func main() {
 	initLog()
-	var configFile = flag.String("c", "config.json", "config")
-	var wizardFile = flag.String("w", "", "wizard")
-	var httpAddr = flag.String("http", "", "http")
+	configFile := flag.String("c", "config.json", "config")
+	wizardFile := flag.String("w", "", "wizard")
+	httpAddr := flag.String("http", "", "http")
 	flag.Parse()
 	if *wizardFile != "" {
 		if err := tools.NewWizard(*configFile, *wizardFile).GenerateConfigsAndScripts(); err != nil {
@@ -46,5 +46,4 @@ func main() {
 		os.Exit(1)
 	}
 	fmt.Printf("run success\n")
-	return
 }

cmd/datax/tools/wizard.go

@@ -18,7 +18,7 @@ import (
 	"encoding/csv"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -56,7 +56,9 @@ func (w *Wizard) GenerateConfigsAndScripts() (err error) {
 	}
 
 	dataSourceExt := filepath.Ext(dataSourceAbsFile)
-	os.MkdirAll(filepath.Join(filepath.Dir(dataSourceAbsFile), "config"), 0755)
+	if err = os.MkdirAll(filepath.Join(filepath.Dir(dataSourceAbsFile), "config"), 0o755); err != nil {
+		return err
+	}
 	dataSourcePrefix := filepath.Join(filepath.Dir(dataSourceAbsFile), "config",
 		filepath.Base(dataSourceAbsFile)[:len(filepath.Base(dataSourceAbsFile))-len(dataSourceExt)])
 
@@ -140,14 +142,14 @@ func (w *Wizard) GenerateConfigsAndScripts() (err error) {
 		}
 
 		filename := dataSourcePrefix + "_" + strconv.Itoa(line) + dataSourceExt
-		err = ioutil.WriteFile(filename, []byte(cloneDataSource.String()), 0644)
+		err = os.WriteFile(filename, []byte(cloneDataSource.String()), fs.FileMode(0o644))
 		if err != nil {
 			return err
 		}
 		scripts = append(scripts, generateScript(filename))
 	}
 
-	err = ioutil.WriteFile("run"+ext(), []byte(strings.Join(scripts, "\n")), 0644)
+	err = os.WriteFile("run"+ext(), []byte(strings.Join(scripts, "\n")), fs.FileMode(0o644))
 	if err != nil {
 		return err
 	}