From 0d7cfe71ca77a7ec939569b87c863e2e7695baa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0=E8=8A=B1?= Date: Sat, 6 Jan 2024 06:20:15 +0800 Subject: [PATCH] update monitor.go --- cmd/agent/monitor/monitor.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/agent/monitor/monitor.go b/cmd/agent/monitor/monitor.go index 480b7d8..e41af97 100644 --- a/cmd/agent/monitor/monitor.go +++ b/cmd/agent/monitor/monitor.go @@ -58,17 +58,15 @@ func GetHost(agentConfig *model.AgentConfig) *model.Host { ret.BootTime = hi.BootTime } - cpuModelCount := make(map[string]int) ci, err := cpu.Info() if err != nil { println("cpu.Info error:", err) - } else { - for i := 0; i < len(ci); i++ { - cpuModelCount[ci[i].ModelName]++ - } - for model, count := range cpuModelCount { - ret.CPU = append(ret.CPU, fmt.Sprintf("%s %d %s Core", model, count, cpuType)) - } + } + count, err := cpu.Counts(false) + if err != nil { + println("cpu.Counts error:", err) + } else if len(ci) > 0 { + ret.CPU = append(ret.CPU, fmt.Sprintf("%s %d %s Core", ci[0].ModelName, count, cpuType)) } ret.DiskTotal, _ = getDiskTotalAndUsed(agentConfig)