fix(nnr): fix nnr traefik show

fix nnr traefik show Signed-off-by: ysicing <i@ysicing.me>
ysicing · Oct 20, 2023 · e0a7a9f · e0a7a9f
1 parent 29b9a50
commit e0a7a9f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/cmd/nnr/nnr.go b/cmd/nnr/nnr.go
@@ -112,7 +112,7 @@ func listRules(f factory.Factory) *cobra.Command {
 				if all {
 					rulename = fmt.Sprintf("%s(%s)", index.Name, color.SGreen(index.Rid))
 				}
-				table.AddRow(rulename, sname, fmt.Sprintf("%v:%v", index.Host, index.Port), fmt.Sprintf("%v:%v", index.Remote, index.RPort), index.Type, util.Traffic(index.Traffic))
+				table.AddRow(rulename, sname, fmt.Sprintf("%v:%v", index.Host, index.Port), fmt.Sprintf("%v:%v", index.Remote, index.RPort), index.Type, util.Traffic(index.Traffic, 1000.0))
 			}
 			return output.EncodeTable(os.Stdout, table)
 		},
@@ -143,7 +143,7 @@ func listRemoteNode(f factory.Factory) *cobra.Command {
 			table := uitable.New()
 			table.AddRow("远程地址", "流量")
 			for _, index := range s {
-				table.AddRow(index.Remote, util.Traffic(index.Traffic))
+				table.AddRow(index.Remote, util.Traffic(index.Traffic, 1000.0))
 			}
 			return output.EncodeTable(os.Stdout, table)
 		},

diff --git a/internal/util/util.go b/internal/util/util.go
@@ -11,15 +11,19 @@ import (
 	"math"
 )
 
-func Traffic(k int64) string {
-	t := math.Round(float64(k)/1024.0/1024.0*100) / 100
+func Traffic(k int64, f ...float64) string {
+	value := 1024.0
+	if len(f) > 0 {
+		value = f[0]
+	}
+	t := math.Round(float64(k)/value/value*100) / 100
 	tunit := "MB"
-	if t >= 1024.0 {
-		t = t / 1024.0
+	if t >= value {
+		t = t / value
 		tunit = "GB"
 	}
-	if t >= 1024.0 {
-		t = t / 1024.0
+	if t >= value {
+		t = t / value
 		tunit = "TB"
 	}
 	return fmt.Sprintf("%.2f%v", t, tunit)