diff --git a/go.mod b/go.mod index 2e190aa..99f78e9 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/go-ole/go-ole v1.2.4 // indirect github.com/go-yaml/yaml v2.1.0+incompatible github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e - github.com/shirou/gopsutil v2.20.7+incompatible + github.com/shirou/gopsutil v2.20.9+incompatible golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 google.golang.org/grpc v1.32.0 ) diff --git a/go.sum b/go.sum index ae9144b..5329e7c 100644 --- a/go.sum +++ b/go.sum @@ -84,6 +84,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/shirou/gopsutil v2.20.7+incompatible h1:Ymv4OD12d6zm+2yONe39VSmp2XooJe8za7ngOLW/o/w= github.com/shirou/gopsutil v2.20.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil v2.20.9+incompatible h1:msXs2frUV+O/JLva9EDLpuJ84PrFsdCTCQex8PUdtkQ= +github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= diff --git a/internal/nodes/node_status_executor.go b/internal/nodes/node_status_executor.go index 388979d..52b5039 100644 --- a/internal/nodes/node_status_executor.go +++ b/internal/nodes/node_status_executor.go @@ -87,7 +87,7 @@ func (this *NodeStatusExecutor) updateCPU(status *NodeStatus) { } percents, err := cpu.Percent(duration, false) if err != nil { - status.Error = err.Error() + status.Error = "cpu.Percent(): " + err.Error() return } if len(percents) == 0 { @@ -100,12 +100,12 @@ func (this *NodeStatusExecutor) updateCPU(status *NodeStatus) { status.CPULogicalCount, err = cpu.Counts(true) if err != nil { - status.Error = err.Error() + status.Error = "cpu.Counts(): " + err.Error() return } status.CPUPhysicalCount, err = cpu.Counts(false) if err != nil { - status.Error = err.Error() + status.Error = "cpu.Counts(): " + err.Error() return } this.cpuLogicalCount = status.CPULogicalCount diff --git a/internal/nodes/node_status_executor_test.go b/internal/nodes/node_status_executor_test.go new file mode 100644 index 0000000..56ff6ae --- /dev/null +++ b/internal/nodes/node_status_executor_test.go @@ -0,0 +1,27 @@ +package nodes + +import ( + "github.com/shirou/gopsutil/cpu" + "testing" + "time" +) + +func TestNodeStatusExecutor_CPU(t *testing.T) { + countLogicCPU, err := cpu.Counts(true) + if err != nil { + t.Fatal(err) + } + t.Log("logic count:", countLogicCPU) + + countPhysicalCPU, err := cpu.Counts(false) + if err != nil { + t.Fatal(err) + } + t.Log("physical count:", countPhysicalCPU) + + percents, err := cpu.Percent(100 * time.Millisecond, false) + if err != nil { + t.Fatal(err) + } + t.Log(percents) +}