1. 更新版本及文档

2. 修复windows不兼容问题

Signed-off-by: 孙林耀 <[email protected]>

README-en.md

@@ -13,13 +13,13 @@ HTTP response message, local file, TCP response message and UDP response message
 #### Local Build
 
 ```shell
-make 
+make common-build
 ```
 
 #### Building with Docker
 
 ```shell
-make && docker build -t data_exporter:0.2.0 .
+make && docker build -t data_exporter:0.4.0 .
 ```
 
 ### Running this software
@@ -51,7 +51,8 @@ curl 127.0.0.1:9116/metrics
 ```shell
 git clone https://github.com/MicroOps-cn/data_exporter
 cd data_exporter/examples/
-docker run  -itd -p 9116:9116 -v `pwd`:/etc/data_exporter/ --name data_exporter microops/data_exporter:0.3.2 --config.path=/etc/data_exporter/data_exporter.yaml
+sed -i 's#../examples/#/etc/data_exporter/#g' data_exporter.yaml
+docker run  -itd -p 9116:9116 -v `pwd`:/etc/data_exporter/ --name data_exporter microops/data_exporter:0.4.0 --config.path=/etc/data_exporter/data_exporter.yaml
 docker logs data_exporter
 ```
 

README.md

@@ -15,13 +15,13 @@ HTTP response message, local file, TCP response message and UDP response message
 #### 通用
 
 ```shell
-make 
+make common-build
 ```
 
 #### 编译Docker镜像
 
 ```shell
-make && docker build -t data_exporter:0.2.0 .
+make && docker build -t data_exporter:0.4.0 .
 ```
 
 ### 运行
@@ -35,7 +35,7 @@ make && docker build -t data_exporter:0.2.0 .
 #### 调试配置文件
 
 ```shell
-./data_exporter --config.path="data_exporter.yaml" --log.level=debug
+./data_exporter debug --config.path="data_exporter.yaml"
 ```
 
 #### 启动examples
@@ -53,7 +53,8 @@ curl 127.0.0.1:9116/metrics
 ```shell
 git clone https://github.com/MicroOps-cn/data_exporter
 cd data_exporter/examples/
-docker run  -itd -p 9116:9116 -v `pwd`:/etc/data_exporter/ --name data_exporter microops/data_exporter:0.3.2 --config.path=/etc/data_exporter/data_exporter.yaml
+sed -i 's#../examples/#/etc/data_exporter/#g' data_exporter.yaml
+docker run  -itd -p 9116:9116 -v `pwd`:/etc/data_exporter/ --name data_exporter microops/data_exporter:0.4.0 --config.path=/etc/data_exporter/data_exporter.yaml
 docker logs data_exporter
 ```
 

VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

pkg/term/term.go

@@ -3,29 +3,8 @@ package term
 import (
 	"bytes"
 	"fmt"
-	"syscall"
-	"unsafe"
 )
 
-func terminalWidth() (int, error) {
-	type window struct {
-		Row    uint16
-		Col    uint16
-		Xpixel uint16
-		Ypixel uint16
-	}
-	w := new(window)
-	tio := syscall.TIOCGWINSZ
-	res, _, err := syscall.Syscall(syscall.SYS_IOCTL,
-		uintptr(syscall.Stdin),
-		uintptr(tio),
-		uintptr(unsafe.Pointer(w)),
-	)
-	if int(res) == -1 {
-		return 0, err
-	}
-	return int(w.Col), nil
-}
 func TitleStr(name string, sep rune) string {
 	var width int
 	var err error

pkg/term/term_unixlike.go

@@ -0,0 +1,28 @@
+//go:build darwin || linux
+
+package term
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func terminalWidth() (int, error) {
+	type window struct {
+		Row    uint16
+		Col    uint16
+		Xpixel uint16
+		Ypixel uint16
+	}
+	w := new(window)
+	tio := syscall.TIOCGWINSZ
+	res, _, err := syscall.Syscall(syscall.SYS_IOCTL,
+		uintptr(syscall.Stdin),
+		uintptr(tio),
+		uintptr(unsafe.Pointer(w)),
+	)
+	if int(res) == -1 {
+		return 0, err
+	}
+	return int(w.Col), nil
+}

pkg/term/term_windows.go

@@ -0,0 +1,5 @@
+package term
+
+func terminalWidth() (int, error) {
+	return 50, nil
+}