From aebc257444a1acaf8929096a326d3fdb0ce1c5cc Mon Sep 17 00:00:00 2001 From: Creling Date: Sat, 27 Feb 2021 16:33:27 +0800 Subject: [PATCH 1/2] fix: correct minor typos in disk usage statistic --- service/monitor/monitor.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/service/monitor/monitor.go b/service/monitor/monitor.go index 16ad4d0..4453318 100644 --- a/service/monitor/monitor.go +++ b/service/monitor/monitor.go @@ -35,7 +35,13 @@ func GetHost() *model.Host { } mv, _ := mem.VirtualMemory() ms, _ := mem.SwapMemory() - u, _ := disk.Usage("/") + u, _ := disk.Partitions(false) + var total uint64 = 0 + for _, dev := range u { + usage, _ := disk.Usage(dev.Mountpoint) + total += usage.Total + } + fmt.Println(total) var ip ipDotSbGeoIP resp, err := http.Get("https://api-ipv4.ip.sb/geoip") if err == nil { @@ -54,7 +60,7 @@ func GetHost() *model.Host { PlatformVersion: hi.PlatformVersion, CPU: cpus, MemTotal: mv.Total, - DiskTotal: u.Total, + DiskTotal: total, SwapTotal: ms.Total, Arch: hi.KernelArch, Virtualization: hi.VirtualizationSystem, @@ -77,13 +83,18 @@ func GetState(delay int64) *model.HostState { cpuPercent = cp[0] } // Disk - u, _ := disk.Usage("/") + u, _ := disk.Partitions(false) + var used uint64 = 0 + for _, dev := range u { + usage, _ := disk.Usage(dev.Mountpoint) + used += usage.Used + } return &model.HostState{ CPU: cpuPercent, MemUsed: mv.Used, SwapUsed: ms.Used, - DiskUsed: u.Used, + DiskUsed: used, NetInTransfer: atomic.LoadUint64(&netInTransfer), NetOutTransfer: atomic.LoadUint64(&netOutTransfer), NetInSpeed: atomic.LoadUint64(&netInSpeed), From 31d4e1eaf9142158c273a736af64f41145542fa2 Mon Sep 17 00:00:00 2001 From: Creling Date: Sat, 27 Feb 2021 17:03:51 +0800 Subject: [PATCH 2/2] fix: correct minor typos --- service/monitor/monitor.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/service/monitor/monitor.go b/service/monitor/monitor.go index 4453318..933cf0a 100644 --- a/service/monitor/monitor.go +++ b/service/monitor/monitor.go @@ -36,12 +36,11 @@ func GetHost() *model.Host { mv, _ := mem.VirtualMemory() ms, _ := mem.SwapMemory() u, _ := disk.Partitions(false) - var total uint64 = 0 + var total uint64 for _, dev := range u { usage, _ := disk.Usage(dev.Mountpoint) total += usage.Total } - fmt.Println(total) var ip ipDotSbGeoIP resp, err := http.Get("https://api-ipv4.ip.sb/geoip") if err == nil { @@ -84,7 +83,7 @@ func GetState(delay int64) *model.HostState { } // Disk u, _ := disk.Partitions(false) - var used uint64 = 0 + var used uint64 for _, dev := range u { usage, _ := disk.Usage(dev.Mountpoint) used += usage.Used