fix & style: fix the issue that datax output too much log, replace th… (

#47) * fix & style: fix the issue that datax output too much log, replace the package "io/ioutil". * style: replace the package "io/ioutil"
Breeze0806 · Aug 16, 2024 · ec574a9 · ec574a9
1 parent 46373d4
commit ec574a9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/cmd/datax/enveronment.go b/cmd/datax/enveronment.go
@@ -17,9 +17,9 @@ package main
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/pprof"
+	"os"
 	"time"
 
 	"github.com/Breeze0806/go-etl/config"
@@ -40,7 +40,7 @@ type enveronment struct {
 func newEnveronment(filename string, addr string) (e *enveronment) {
 	e = &enveronment{}
 	var buf []byte
-	buf, e.err = ioutil.ReadFile(filename)
+	buf, e.err = os.ReadFile(filename)
 	if e.err != nil {
 		return e
 	}
@@ -101,15 +101,14 @@ func (e *enveronment) startEngine() *enveronment {
 		return e
 	}
 	go func() {
-		statsTimer := time.NewTicker(5 * time.Second)
+		statsTimer := time.NewTicker(1 * time.Second)
 		defer statsTimer.Stop()
 		exit := false
 		for {
 			select {
 			case <-statsTimer.C:
 			case <-e.ctx.Done():
 				exit = true
-			default:
 			}
 			if e.engine.Container != nil {
 				fmt.Printf("%v\r", e.engine.Metrics().JSON())

diff --git a/tools/datax/build/main.go b/tools/datax/build/main.go
@@ -19,7 +19,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io/fs"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -179,15 +179,15 @@ type pluginParser struct {
 }
 
 func (p *pluginParser) readPackages(path string, ignoreMap map[string]struct{}) (err error) {
-	var list []os.FileInfo
-	list, err = ioutil.ReadDir(path)
+	var list []fs.DirEntry
+	list, err = os.ReadDir(path)
 	if err != nil {
 		return err
 	}
 	var data []byte
 	for _, v := range list {
 		if v.IsDir() {
-			data, err = ioutil.ReadFile(filepath.Join(path, v.Name(), "resources", "plugin.json"))
+			data, err = os.ReadFile(filepath.Join(path, v.Name(), "resources", "plugin.json"))
 			if err != nil {
 				err = nil
 				continue

diff --git a/tools/datax/release/main.go b/tools/datax/release/main.go
@@ -21,7 +21,7 @@ import (
 	"compress/gzip"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"io/fs"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -56,25 +56,25 @@ func main() {
 		os.Exit(1)
 	}
 
-	data, err := ioutil.ReadFile("README_USER.md")
+	data, err := os.ReadFile("README_USER.md")
 	if err != nil {
 		fmt.Println("ReadFile README_USER.md fail. err:", err)
 		os.Exit(1)
 	}
 
-	err = ioutil.WriteFile("release/README_USER.md", data, os.ModePerm)
+	err = os.WriteFile("release/README_USER.md", data, os.ModePerm)
 	if err != nil {
 		fmt.Println("WriteFile release/README_USER.md fail. err:", err)
 		os.Exit(1)
 	}
 
-	data, err = ioutil.ReadFile("README_USER_zh-CN.md")
+	data, err = os.ReadFile("README_USER_zh-CN.md")
 	if err != nil {
 		fmt.Println("ReadFile README_USER.md fail. err:", err)
 		os.Exit(1)
 	}
 
-	err = ioutil.WriteFile("release/README_USER_zh-CN.md", data, os.ModePerm)
+	err = os.WriteFile("release/README_USER_zh-CN.md", data, os.ModePerm)
 	if err != nil {
 		fmt.Println("WriteFile release/README_USER.md fail. err:", err)
 		os.Exit(1)
@@ -107,32 +107,32 @@ func main() {
 }
 
 func copyMarkdown(path string) (err error) {
-	var list []os.FileInfo
-	list, err = ioutil.ReadDir(filepath.Join(sourceUserPath, path))
+	var list []fs.DirEntry
+	list, err = os.ReadDir(filepath.Join(sourceUserPath, path))
 	if err != nil {
 		return err
 	}
 	var data []byte
 	for _, v := range list {
 		if v.IsDir() {
-			data, err = ioutil.ReadFile(filepath.Join(sourceUserPath, path, v.Name(), "README.md"))
+			data, err = os.ReadFile(filepath.Join(sourceUserPath, path, v.Name(), "README.md"))
 			if err != nil {
 				err = nil
 				continue
 			}
 			os.MkdirAll(filepath.Join(destUserPath, path, v.Name()), os.ModePerm)
-			err = ioutil.WriteFile(filepath.Join(destUserPath, path, v.Name(), "README.md"), data, 0644)
+			err = os.WriteFile(filepath.Join(destUserPath, path, v.Name(), "README.md"), data, 0644)
 			if err != nil {
 				return
 			}
 
-			data, err = ioutil.ReadFile(filepath.Join(sourceUserPath, path, v.Name(), "README_zh-CN.md"))
+			data, err = os.ReadFile(filepath.Join(sourceUserPath, path, v.Name(), "README_zh-CN.md"))
 			if err != nil {
 				err = nil
 				continue
 			}
 			os.MkdirAll(filepath.Join(destUserPath, path, v.Name()), os.ModePerm)
-			err = ioutil.WriteFile(filepath.Join(destUserPath, path, v.Name(), "README_zh-CN.md"), data, 0644)
+			err = os.WriteFile(filepath.Join(destUserPath, path, v.Name(), "README_zh-CN.md"), data, 0644)
 			if err != nil {
 				return
 			}
@@ -143,21 +143,21 @@ func copyMarkdown(path string) (err error) {
 
 func copyConfig() (err error) {
 	os.MkdirAll(destExamplePath, os.ModePerm)
-	var list []os.FileInfo
-	list, err = ioutil.ReadDir(sourceExamplePath)
+	var list []fs.DirEntry
+	list, err = os.ReadDir(sourceExamplePath)
 	if err != nil {
 		return err
 	}
 	var data []byte
 	for _, v := range list {
 		if v.IsDir() {
-			data, err = ioutil.ReadFile(filepath.Join(sourceExamplePath, v.Name(), "config.json"))
+			data, err = os.ReadFile(filepath.Join(sourceExamplePath, v.Name(), "config.json"))
 			if err != nil {
 				err = nil
 				continue
 			}
 			os.MkdirAll(filepath.Join(destExamplePath, v.Name()), os.ModePerm)
-			err = ioutil.WriteFile(filepath.Join(destExamplePath, v.Name(), "config.json"), data, 0644)
+			err = os.WriteFile(filepath.Join(destExamplePath, v.Name(), "config.json"), data, 0644)
 			if err != nil {
 				return
 			}

diff --git a/tools/license/main.go b/tools/license/main.go
@@ -19,7 +19,6 @@ import (
 	"flag"
 	"fmt"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -107,8 +106,8 @@ func main() {
 
 // Read packages exclude vendor,.vscode,.git
 func readPackages(path string) (packages []string, err error) {
-	var list []os.FileInfo
-	list, err = ioutil.ReadDir(path)
+	var list []fs.DirEntry
+	list, err = os.ReadDir(path)
 	if err != nil {
 		return
 	}
@@ -127,7 +126,7 @@ func readPackages(path string) (packages []string, err error) {
 
 // Check License
 func addLicenseHeader(filename string) error {
-	data, err := ioutil.ReadFile(filename)
+	data, err := os.ReadFile(filename)
 	if err != nil {
 		return err
 	}
@@ -156,7 +155,7 @@ func addLicenseHeader(filename string) error {
 
 // Check License
 func checkLicenseHeader(filename string) error {
-	data, err := ioutil.ReadFile(filename)
+	data, err := os.ReadFile(filename)
 	if err != nil {
 		return err
 	}