Lomanic
/
gopsutil
mirror of https://github.com/shirou/gopsutil
1
0
Fork 0
Code Issues Releases Activity

[mem][solaris] don't hardcode path to prtconf in error message

Browse Source
pull/1161/head
Ville Skyttä 4 years ago
parent d863ea4cc5
commit 768c3b1888
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File

3
mem/mem_solaris.go
Unescape Escape View File

@ -4,7 +4,6 @@ package mem
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"os/exec" "os/exec"
"regexp" "regexp"
@ -84,7 +83,7 @@ func globalZoneMemoryCapacity() (uint64, error) {
match := globalZoneMemoryCapacityMatch.FindAllStringSubmatch(string(out), -1) match := globalZoneMemoryCapacityMatch.FindAllStringSubmatch(string(out), -1)
if len(match) != 1 { if len(match) != 1 {
return 0, errors.New("memory size not contained in output of /usr/sbin/prtconf") return 0, fmt.Errorf("memory size not contained in output of %q", prtconf)
} }
totalMB, err := strconv.ParseUint(match[0][1], 10, 64) totalMB, err := strconv.ParseUint(match[0][1], 10, 64)

3
v3/mem/mem_solaris.go
Unescape Escape View File

@ -4,7 +4,6 @@ package mem
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"os/exec" "os/exec"
"regexp" "regexp"
@ -84,7 +83,7 @@ func globalZoneMemoryCapacity() (uint64, error) {
match := globalZoneMemoryCapacityMatch.FindAllStringSubmatch(string(out), -1) match := globalZoneMemoryCapacityMatch.FindAllStringSubmatch(string(out), -1)
if len(match) != 1 { if len(match) != 1 {
return 0, errors.New("memory size not contained in output of /usr/sbin/prtconf") return 0, fmt.Errorf("memory size not contained in output of %q", prtconf)
} }
totalMB, err := strconv.ParseUint(match[0][1], 10, 64) totalMB, err := strconv.ParseUint(match[0][1], 10, 64)

Write Preview
Loading…
Cancel
Save