mirror of
https://github.com/shirou/gopsutil.git
synced 2025-05-02 22:17:08 +08:00
Merge pull request #1173 from mmorel-35/golangci-lint
setup golangci-lint
This commit is contained in:
commit
214bc8d948
23
.github/workflows/lint.yml
vendored
Normal file
23
.github/workflows/lint.yml
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
name: Golangci-lint
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
golangci:
|
||||||
|
name: lint
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Setup go
|
||||||
|
uses: actions/setup-go@v2
|
||||||
|
with:
|
||||||
|
go-version: 1.17
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
- name: Setup golangci-lint
|
||||||
|
uses: golangci/golangci-lint-action@v2
|
||||||
|
with:
|
||||||
|
args: --verbose
|
||||||
|
version: latest
|
||||||
|
working-directory: v3
|
10
.golangci.yml
Normal file
10
.golangci.yml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
linters:
|
||||||
|
disable:
|
||||||
|
- deadcode
|
||||||
|
- errcheck
|
||||||
|
- govet
|
||||||
|
- ineffassign
|
||||||
|
- staticcheck
|
||||||
|
- structcheck
|
||||||
|
- unused
|
||||||
|
- varcheck
|
@ -240,7 +240,7 @@ func parseStatLine(line string) (*TimesStat, error) {
|
|||||||
return nil, errors.New("stat does not contain cpu info")
|
return nil, errors.New("stat does not contain cpu info")
|
||||||
}
|
}
|
||||||
|
|
||||||
if strings.HasPrefix(fields[0], "cpu") == false {
|
if !strings.HasPrefix(fields[0], "cpu") {
|
||||||
return nil, errors.New("not contain cpu")
|
return nil, errors.New("not contain cpu")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -349,7 +349,7 @@ func IOCountersWithContext(ctx context.Context, names ...string) (map[string]IOC
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
ret := make(map[string]IOCountersStat, 0)
|
ret := make(map[string]IOCountersStat)
|
||||||
empty := IOCountersStat{}
|
empty := IOCountersStat{}
|
||||||
|
|
||||||
// use only basename such as "/dev/sda1" to "sda1"
|
// use only basename such as "/dev/sda1" to "sda1"
|
||||||
|
@ -41,8 +41,7 @@ func CallLsofWithContext(ctx context.Context, invoke Invoker, pid int32, args ..
|
|||||||
}
|
}
|
||||||
|
|
||||||
func CallPgrepWithContext(ctx context.Context, invoke Invoker, pid int32) ([]int32, error) {
|
func CallPgrepWithContext(ctx context.Context, invoke Invoker, pid int32) ([]int32, error) {
|
||||||
var cmd []string
|
cmd := []string{"-P", strconv.Itoa(int(pid))}
|
||||||
cmd = []string{"-P", strconv.Itoa(int(pid))}
|
|
||||||
pgrep, err := exec.LookPath("pgrep")
|
pgrep, err := exec.LookPath("pgrep")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return []int32{}, err
|
return []int32{}, err
|
||||||
|
@ -131,7 +131,7 @@ func (l *ConntrackStatList) Append(c *ConntrackStat) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (l *ConntrackStatList) Items() []ConntrackStat {
|
func (l *ConntrackStatList) Items() []ConntrackStat {
|
||||||
items := make([]ConntrackStat, len(l.items), len(l.items))
|
items := make([]ConntrackStat, len(l.items))
|
||||||
for i, el := range l.items {
|
for i, el := range l.items {
|
||||||
items[i] = *el
|
items[i] = *el
|
||||||
}
|
}
|
||||||
|
@ -140,7 +140,7 @@ func IOCountersByFileWithContext(ctx context.Context, pernic bool, filename stri
|
|||||||
ret = append(ret, nic)
|
ret = append(ret, nic)
|
||||||
}
|
}
|
||||||
|
|
||||||
if pernic == false {
|
if !pernic {
|
||||||
return getIOCountersAll(ret)
|
return getIOCountersAll(ret)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -726,10 +726,7 @@ func (p *Process) fillFromIOWithContext(ctx context.Context) (*IOCountersStat, e
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
param := field[0]
|
param := strings.TrimSuffix(field[0], ":")
|
||||||
if strings.HasSuffix(param, ":") {
|
|
||||||
param = param[:len(param)-1]
|
|
||||||
}
|
|
||||||
switch param {
|
switch param {
|
||||||
case "syscr":
|
case "syscr":
|
||||||
ret.ReadCount = t
|
ret.ReadCount = t
|
||||||
|
Loading…
x
Reference in New Issue
Block a user