️ fix Agent 重复取进程数

This commit is contained in:
naiba
2021-08-19 23:57:45 +08:00
parent 88b904b013
commit 0fde19d290
3 changed files with 2 additions and 30 deletions

View File

@@ -15,7 +15,6 @@ import (
"github.com/shirou/gopsutil/v3/load"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v3/net"
"github.com/shirou/gopsutil/v3/process"
"github.com/naiba/nezha/model"
)
@@ -114,23 +113,6 @@ func GetState(conf GetStateConfig) *model.HostState {
}
}
var processCount uint64
if !conf.SkipProcessCount {
ps, _ := process.Pids()
processCount = uint64(len(ps))
// log.Println("pids", len(ps), err)
// var threads uint64
// for i := 0; i < len(ps); i++ {
// p, err := process.NewProcess(ps[i])
// if err != nil {
// continue
// }
// c, _ := p.NumThreads()
// threads += uint64(c)
// }
// log.Println("threads", threads)
}
return &model.HostState{
CPU: cpuPercent,
MemUsed: mv.Total - mv.Available,
@@ -146,7 +128,7 @@ func GetState(conf GetStateConfig) *model.HostState {
Load15: loadStat.Load15,
TcpConnCount: tcpConnCount,
UdpConnCount: udpConnCount,
ProcessCount: processCount,
ProcessCount: hi.Procs,
}
}