优化代码

This commit is contained in:
GoEdgeLab
2023-07-08 18:59:08 +08:00
parent 7f1f8f59f4
commit 774529de6d

View File

@@ -13,12 +13,12 @@ import (
"github.com/TeaOSLab/EdgeNode/internal/rpc" "github.com/TeaOSLab/EdgeNode/internal/rpc"
"github.com/TeaOSLab/EdgeNode/internal/trackers" "github.com/TeaOSLab/EdgeNode/internal/trackers"
"github.com/TeaOSLab/EdgeNode/internal/utils" "github.com/TeaOSLab/EdgeNode/internal/utils"
fsutils "github.com/TeaOSLab/EdgeNode/internal/utils/fs"
"github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/maps"
"github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/disk" "github.com/shirou/gopsutil/v3/disk"
"github.com/shirou/gopsutil/v3/net" "github.com/shirou/gopsutil/v3/net"
"golang.org/x/sys/unix"
"math" "math"
"os" "os"
"runtime" "runtime"
@@ -279,16 +279,15 @@ func (this *NodeStatusExecutor) updateCacheSpace(status *nodeconfigs.NodeStatus)
var result = []maps.Map{} var result = []maps.Map{}
var cachePaths = caches.SharedManager.FindAllCachePaths() var cachePaths = caches.SharedManager.FindAllCachePaths()
for _, path := range cachePaths { for _, path := range cachePaths {
var stat unix.Statfs_t stat, err := fsutils.Stat(path)
err := unix.Statfs(path, &stat)
if err != nil { if err != nil {
return return
} }
result = append(result, maps.Map{ result = append(result, maps.Map{
"path": path, "path": path,
"total": stat.Blocks * uint64(stat.Bsize), "total": stat.TotalSize(),
"avail": stat.Bavail * uint64(stat.Bsize), "avail": stat.AvailableSize(),
"used": (stat.Blocks - stat.Bavail) * uint64(stat.Bsize), "used": stat.UsedSize(),
}) })
} }
monitor.SharedValueQueue.Add(nodeconfigs.NodeValueItemCacheDir, maps.Map{ monitor.SharedValueQueue.Add(nodeconfigs.NodeValueItemCacheDir, maps.Map{