OrgGo/shirou_gopsutil
1
0
Fork 0
mirror of https://github.com/shirou/gopsutil.git synced 2025-05-01 13:48:52 +08:00
Code Issues Projects Releases Wiki Activity

[host] go-fmt and propagate context on Windows in Info()

Browse Source
This commit is contained in:
Lomanic 2019-08-07 22:34:36 +02:00
parent d80c43f9c9
commit 98c779765f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
host/host_windows.go
View File

@ -77,7 +77,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
} }
{ {
boot, err := BootTime() boot, err := BootTimeWithContext(ctx)
if err == nil { if err == nil {
ret.BootTime = boot ret.BootTime = boot
ret.Uptime, _ = Uptime() ret.Uptime, _ = Uptime()
@ -87,12 +87,12 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
{ {
hostID, err := getMachineGuid() hostID, err := getMachineGuid()
if err == nil { if err == nil {
ret.HostID = strings.ToLower(hostID) ret.HostID = hostID
} }
} }
{ {
procs, err := process.Pids() procs, err := process.PidsWithContext(ctx)
if err == nil { if err == nil {
ret.Procs = uint64(len(procs)) ret.Procs = uint64(len(procs))
} }
@ -128,7 +128,7 @@ func getMachineGuid() (string, error) {
return "", fmt.Errorf("HostID incorrect: %q\n", hostID) return "", fmt.Errorf("HostID incorrect: %q\n", hostID)
} }
return hostID, nil return strings.ToLower(hostID), nil
} }
func Uptime() (uint64, error) { func Uptime() (uint64, error) {

4
host/types.go
View File

@ -5,7 +5,7 @@ import (
) )
type Warnings struct { type Warnings struct {
List []error List []error
} }
func (w *Warnings) Add(err error) { func (w *Warnings) Add(err error) {
@ -21,5 +21,5 @@ func (w *Warnings) Reference() error {
} }
func (w *Warnings) Error() string { func (w *Warnings) Error() string {
return fmt.Sprintf("Number of warnings: %v", len(w.List)) return fmt.Sprintf("Number of warnings: %v", len(w.List))
} }