From f8ef680a477faa3ad8de239d31cf4d5183c17747 Mon Sep 17 00:00:00 2001 From: WAKAYAMA Shirou Date: Wed, 15 Mar 2017 22:43:20 +0900 Subject: [PATCH] error strings change to lowercase --- cpu/cpu.go | 2 +- cpu/cpu_freebsd.go | 10 +++++----- cpu/cpu_solaris.go | 42 +++++++++++++++++++++--------------------- host/host_solaris.go | 2 +- mem/mem_solaris.go | 6 +++--- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/cpu/cpu.go b/cpu/cpu.go index fc2e8d8..2bd5c8d 100644 --- a/cpu/cpu.go +++ b/cpu/cpu.go @@ -171,7 +171,7 @@ func percentUsedFromLastCall(percpu bool) ([]float64, error) { } if lastTimes == nil { - return nil, fmt.Errorf("Error getting times for cpu percent. LastTimes was nil") + return nil, fmt.Errorf("error getting times for cpu percent. lastTimes was nil") } return calculateAllBusy(lastTimes, cpuTimes) } diff --git a/cpu/cpu_freebsd.go b/cpu/cpu_freebsd.go index 5834d6e..877fe7e 100644 --- a/cpu/cpu_freebsd.go +++ b/cpu/cpu_freebsd.go @@ -118,7 +118,7 @@ func Info() ([]InfoStat, error) { return nil, err } if c.Mhz, err = strconv.ParseFloat(vals[0], 64); err != nil { - return nil, fmt.Errorf("Unable to parse FreeBSD CPU clock rate: %v", err) + return nil, fmt.Errorf("unable to parse FreeBSD CPU clock rate: %v", err) } if vals, err = common.DoSysctrl("hw.ncpu"); err != nil { @@ -126,7 +126,7 @@ func Info() ([]InfoStat, error) { } var i64 int64 if i64, err = strconv.ParseInt(vals[0], 10, 32); err != nil { - return nil, fmt.Errorf("Unable to parse FreeBSD cores: %v", err) + return nil, fmt.Errorf("unable to parse FreeBSD cores: %v", err) } c.Cores = int32(i64) @@ -156,7 +156,7 @@ func parseDmesgBoot(fileName string) (InfoStat, int, error) { c.Model = matches[4] t, err := strconv.ParseInt(matches[5], 10, 32) if err != nil { - return c, 0, fmt.Errorf("Unable to parse FreeBSD CPU stepping information from %q: %v", line, err) + return c, 0, fmt.Errorf("unable to parse FreeBSD CPU stepping information from %q: %v", line, err) } c.Stepping = int32(t) } else if matches := featuresMatch.FindStringSubmatch(line); matches != nil { @@ -170,12 +170,12 @@ func parseDmesgBoot(fileName string) (InfoStat, int, error) { } else if matches := cpuCores.FindStringSubmatch(line); matches != nil { t, err := strconv.ParseInt(matches[1], 10, 32) if err != nil { - return c, 0, fmt.Errorf("Unable to parse FreeBSD CPU Nums from %q: %v", line, err) + return c, 0, fmt.Errorf("unable to parse FreeBSD CPU Nums from %q: %v", line, err) } cpuNum = int(t) t2, err := strconv.ParseInt(matches[2], 10, 32) if err != nil { - return c, 0, fmt.Errorf("Unable to parse FreeBSD CPU cores from %q: %v", line, err) + return c, 0, fmt.Errorf("unable to parse FreeBSD CPU cores from %q: %v", line, err) } c.Cores = int32(t2) } diff --git a/cpu/cpu_solaris.go b/cpu/cpu_solaris.go index 7117a0f..b56786b 100644 --- a/cpu/cpu_solaris.go +++ b/cpu/cpu_solaris.go @@ -36,30 +36,30 @@ func Times(percpu bool) ([]TimesStat, error) { func Info() ([]InfoStat, error) { psrInfo, err := exec.LookPath("/usr/sbin/psrinfo") if err != nil { - return nil, fmt.Errorf("Cannot find psrinfo: %s", err) + return nil, fmt.Errorf("cannot find psrinfo: %s", err) } psrInfoOut, err := invoke.Command(psrInfo, "-p", "-v") if err != nil { - return nil, fmt.Errorf("Cannot execute psrinfo: %s", err) + return nil, fmt.Errorf("cannot execute psrinfo: %s", err) } isaInfo, err := exec.LookPath("/usr/bin/isainfo") if err != nil { - return nil, fmt.Errorf("Cannot find isainfo: %s", err) + return nil, fmt.Errorf("cannot find isainfo: %s", err) } isaInfoOut, err := invoke.Command(isaInfo, "-b", "-v") if err != nil { - return nil, fmt.Errorf("Cannot execute isainfo: %s", err) + return nil, fmt.Errorf("cannot execute isainfo: %s", err) } procs, err := parseProcessorInfo(string(psrInfoOut)) if err != nil { - return nil, fmt.Errorf("Error parsing psrinfo output: %s", err) + return nil, fmt.Errorf("error parsing psrinfo output: %s", err) } flags, err := parseISAInfo(string(isaInfoOut)) if err != nil { - return nil, fmt.Errorf("Error parsing isainfo output: %s", err) + return nil, fmt.Errorf("error parsing isainfo output: %s", err) } result := make([]InfoStat, 0, len(flags)) @@ -79,7 +79,7 @@ func parseISAInfo(cmdOutput string) ([]string, error) { // Sanity check the output if len(words) < 4 || words[1] != "bit" || words[3] != "applications" { - return nil, errors.New("Attempted to parse invalid isainfo output") + return nil, errors.New("attempted to parse invalid isainfo output") } flags := make([]string, len(words)-4) @@ -94,15 +94,15 @@ func parseISAInfo(cmdOutput string) ([]string, error) { var psrInfoMatch = regexp.MustCompile(`The physical processor has (?:([\d]+) virtual processor \(([\d]+)\)|([\d]+) cores and ([\d]+) virtual processors[^\n]+)\n(?:\s+ The core has.+\n)*\s+.+ \((\w+) ([\S]+) family (.+) model (.+) step (.+) clock (.+) MHz\)\n[\s]*(.*)`) const ( - psrNumCoresOffset = 1 + psrNumCoresOffset = 1 psrNumCoresHTOffset = 3 - psrNumHTOffset = 4 - psrVendorIDOffset = 5 - psrFamilyOffset = 7 - psrModelOffset = 8 - psrStepOffset = 9 - psrClockOffset = 10 - psrModelNameOffset = 11 + psrNumHTOffset = 4 + psrVendorIDOffset = 5 + psrFamilyOffset = 7 + psrModelOffset = 8 + psrStepOffset = 9 + psrClockOffset = 10 + psrModelNameOffset = 11 ) func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) { @@ -117,7 +117,7 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) { if physicalCPU[psrStepOffset] != "" { stepParsed, err := strconv.ParseInt(physicalCPU[psrStepOffset], 10, 32) if err != nil { - return nil, fmt.Errorf("Cannot parse value %q for step as 32-bit integer: %s", physicalCPU[9], err) + return nil, fmt.Errorf("cannot parse value %q for step as 32-bit integer: %s", physicalCPU[9], err) } step = int32(stepParsed) } @@ -125,7 +125,7 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) { if physicalCPU[psrClockOffset] != "" { clockParsed, err := strconv.ParseInt(physicalCPU[psrClockOffset], 10, 64) if err != nil { - return nil, fmt.Errorf("Cannot parse value %q for clock as 32-bit integer: %s", physicalCPU[10], err) + return nil, fmt.Errorf("cannot parse value %q for clock as 32-bit integer: %s", physicalCPU[10], err) } clock = float64(clockParsed) } @@ -137,7 +137,7 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) { case physicalCPU[psrNumCoresOffset] != "": numCores, err = strconv.ParseInt(physicalCPU[psrNumCoresOffset], 10, 32) if err != nil { - return nil, fmt.Errorf("Cannot parse value %q for core count as 32-bit integer: %s", physicalCPU[1], err) + return nil, fmt.Errorf("cannot parse value %q for core count as 32-bit integer: %s", physicalCPU[1], err) } for i := 0; i < int(numCores); i++ { @@ -158,12 +158,12 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) { case physicalCPU[psrNumCoresHTOffset] != "": numCores, err = strconv.ParseInt(physicalCPU[psrNumCoresHTOffset], 10, 32) if err != nil { - return nil, fmt.Errorf("Cannot parse value %q for core count as 32-bit integer: %s", physicalCPU[3], err) + return nil, fmt.Errorf("cannot parse value %q for core count as 32-bit integer: %s", physicalCPU[3], err) } numHT, err = strconv.ParseInt(physicalCPU[psrNumHTOffset], 10, 32) if err != nil { - return nil, fmt.Errorf("Cannot parse value %q for hyperthread count as 32-bit integer: %s", physicalCPU[4], err) + return nil, fmt.Errorf("cannot parse value %q for hyperthread count as 32-bit integer: %s", physicalCPU[4], err) } for i := 0; i < int(numCores); i++ { @@ -182,7 +182,7 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) { infoStatCount++ } default: - return nil, errors.New("Values for cores with and without hyperthreading are both set") + return nil, errors.New("values for cores with and without hyperthreading are both set") } } return result, nil diff --git a/host/host_solaris.go b/host/host_solaris.go index 79e25d5..ad55896 100644 --- a/host/host_solaris.go +++ b/host/host_solaris.go @@ -109,7 +109,7 @@ func BootTime() (uint64, error) { kstats := kstatMatch.FindAllStringSubmatch(string(out), -1) if len(kstats) != 1 { - return 0, fmt.Errorf("Expected 1 kstat, found %d", len(kstats)) + return 0, fmt.Errorf("expected 1 kstat, found %d", len(kstats)) } return strconv.ParseUint(kstats[0][2], 10, 64) diff --git a/mem/mem_solaris.go b/mem/mem_solaris.go index 9c5111b..aa4f253 100644 --- a/mem/mem_solaris.go +++ b/mem/mem_solaris.go @@ -56,7 +56,7 @@ func zoneName() (string, error) { return strings.TrimSpace(string(out)), nil } -var globalZoneMemoryCapacityMatch = regexp.MustCompile(`Memory size: ([\d]+) Megabytes`) +var globalZoneMemoryCapacityMatch = regexp.MustCompile(`memory size: ([\d]+) Megabytes`) func globalZoneMemoryCapacity() (uint64, error) { prtconf, err := exec.LookPath("/usr/sbin/prtconf") @@ -71,7 +71,7 @@ func globalZoneMemoryCapacity() (uint64, error) { match := globalZoneMemoryCapacityMatch.FindAllStringSubmatch(string(out), -1) if len(match) != 1 { - return 0, errors.New("Memory size not contained in output of /usr/sbin/prtconf") + return 0, errors.New("memory size not contained in output of /usr/sbin/prtconf") } totalMB, err := strconv.ParseUint(match[0][1], 10, 64) @@ -97,7 +97,7 @@ func nonGlobalZoneMemoryCapacity() (uint64, error) { kstats := kstatMatch.FindAllStringSubmatch(string(out), -1) if len(kstats) != 1 { - return 0, fmt.Errorf("Expected 1 kstat, found %d", len(kstats)) + return 0, fmt.Errorf("expected 1 kstat, found %d", len(kstats)) } memSizeBytes, err := strconv.ParseUint(kstats[0][2], 10, 64)