From 989aa8f3b346b41ef3b38dd456af9a75059d6eb2 Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Mon, 29 Jul 2024 06:39:30 +0000 Subject: [PATCH] update --- system/gpu.go | 8 ++------ system/system.go | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/system/gpu.go b/system/gpu.go index ab75694..138e05a 100644 --- a/system/gpu.go +++ b/system/gpu.go @@ -21,16 +21,12 @@ const maxDeviceDataFetchAttempts = 3 // 获取主机数据的尝试次数,Key 为 Host 的属性名 var hostDataFetchAttempts = map[string]int{ - "CPU": 0, "GPU": 0, } // 获取状态数据的尝试次数,Key 为 HostState 的属性名 var statDataFetchAttempts = map[string]int{ - "CPU": 0, - "Load": 0, - "GPU": 0, - "Temperatures": 0, + "GPU": 0, } func atomicStoreFloat64(x *uint64, v float64) { @@ -78,7 +74,7 @@ func getGPUInfo(ret *model.SystemInfo) (*model.SystemInfo, error) { wg.Add(1) go updateGPUStat(&gpuStat, &wg) wg.Wait() // 等待 updateGPUStat 完成 - ret.GpuStats = fmt.Sprintf("%f", math.Float64frombits(gpuStat)) + ret.GpuStats = fmt.Sprintf("%f", math.Float64frombits(gpuStat)) return ret, nil } else { hostDataFetchAttempts["GPU"]++ diff --git a/system/system.go b/system/system.go index 9ef3264..df39fe9 100644 --- a/system/system.go +++ b/system/system.go @@ -30,22 +30,22 @@ func GetSystemInfo() *model.SystemInfo { } // 系统信息查询 cpuType, ret.Uptime, ret.Platform, ret.Kernel, ret.Arch, ret.VmType, ret.NatType, ret.TimeZone, err = getHostInfo() - if model.EnableLoger { + if err != nil && model.EnableLoger { Logger.Info(err.Error()) } // CPU信息查询 ret, err = getCpuInfo(ret, cpuType) - if model.EnableLoger { + if err != nil && model.EnableLoger { Logger.Info(err.Error()) } // GPU信息查询 ret, err = getGPUInfo(ret) - if model.EnableLoger { + if err != nil && model.EnableLoger { Logger.Info(err.Error()) } // 硬盘信息查询 ret.DiskTotal, ret.DiskUsage, ret.Percentage, ret.BootPath, err = getDiskInfo() - if model.EnableLoger { + if err != nil && model.EnableLoger { Logger.Info(err.Error()) } // 内存信息查询