Skip to content

Commit

Permalink
Merge pull request shirou#1173 from mmorel-35/golangci-lint
Browse files Browse the repository at this point in the history
setup golangci-lint
  • Loading branch information
shirou authored Nov 7, 2021
2 parents 36cc0d3 + 46ae957 commit 214bc8d
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 10 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -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 changes: 10 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
linters:
disable:
- deadcode
- errcheck
- govet
- ineffassign
- staticcheck
- structcheck
- unused
- varcheck
2 changes: 1 addition & 1 deletion v3/cpu/cpu_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func parseStatLine(line string) (*TimesStat, error) {
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")
}

Expand Down
2 changes: 1 addition & 1 deletion v3/disk/disk_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ func IOCountersWithContext(ctx context.Context, names ...string) (map[string]IOC
if err != nil {
return nil, err
}
ret := make(map[string]IOCountersStat, 0)
ret := make(map[string]IOCountersStat)
empty := IOCountersStat{}

// use only basename such as "/dev/sda1" to "sda1"
Expand Down
3 changes: 1 addition & 2 deletions v3/internal/common/common_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
var cmd []string
cmd = []string{"-P", strconv.Itoa(int(pid))}
cmd := []string{"-P", strconv.Itoa(int(pid))}
pgrep, err := exec.LookPath("pgrep")
if err != nil {
return []int32{}, err
Expand Down
2 changes: 1 addition & 1 deletion v3/net/net.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (l *ConntrackStatList) Append(c *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 {
items[i] = *el
}
Expand Down
2 changes: 1 addition & 1 deletion v3/net/net_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func IOCountersByFileWithContext(ctx context.Context, pernic bool, filename stri
ret = append(ret, nic)
}

if pernic == false {
if !pernic {
return getIOCountersAll(ret)
}

Expand Down
5 changes: 1 addition & 4 deletions v3/process/process_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -726,10 +726,7 @@ func (p *Process) fillFromIOWithContext(ctx context.Context) (*IOCountersStat, e
if err != nil {
return nil, err
}
param := field[0]
if strings.HasSuffix(param, ":") {
param = param[:len(param)-1]
}
param := strings.TrimSuffix(field[0], ":")
switch param {
case "syscr":
ret.ReadCount = t
Expand Down

0 comments on commit 214bc8d

Please sign in to comment.