diff --git a/docker/docker_notlinux.go b/docker/docker_notlinux.go index b45f96c8..08909aaa 100644 --- a/docker/docker_notlinux.go +++ b/docker/docker_notlinux.go @@ -6,7 +6,7 @@ import ( "encoding/json" "github.com/shirou/gopsutil/cpu" - "github.com/shirou/gopsutil/internal/common" + "github.com/shirou/gopsutil/internal/common" ) // GetDockerIDList returnes a list of DockerID. diff --git a/mem/mem_freebsd.go b/mem/mem_freebsd.go index 0cb33abc..7c64f105 100644 --- a/mem/mem_freebsd.go +++ b/mem/mem_freebsd.go @@ -3,10 +3,11 @@ package mem import ( + "errors" "os/exec" "strconv" "strings" - "errors" + "github.com/shirou/gopsutil/internal/common" ) diff --git a/net/net.go b/net/net.go index 66d5991b..77cfd10e 100644 --- a/net/net.go +++ b/net/net.go @@ -65,8 +65,8 @@ type NetInterfaceStat struct { } type NetFilterStat struct { - ConnTrackCount int64 `json:"conntrack_count"` - ConnTrackMax int64 `json:"conntrack_max"` + ConnTrackCount int64 `json:"conntrack_count"` + ConnTrackMax int64 `json:"conntrack_max"` } var constMap = map[string]int{ diff --git a/net/net_linux.go b/net/net_linux.go index ef06814d..b15e03b6 100644 --- a/net/net_linux.go +++ b/net/net_linux.go @@ -165,8 +165,8 @@ func NetProtoCounters(protocols []string) ([]NetProtoCountersStat, error) { // the currently in use conntrack count and the max. // If the file does not exist or is invalid it will return nil. func NetFilterCounters() ([]NetFilterStat, error) { - countfile := common.HostProc("sys/net/netfilter/nf_conntrack_count") - maxfile := common.HostProc("sys/net/netfilter/nf_conntrack_max") + countfile := common.HostProc("sys/net/netfilter/nf_conntrack_count") + maxfile := common.HostProc("sys/net/netfilter/nf_conntrack_max") count, err := common.ReadInts(countfile) @@ -174,7 +174,7 @@ func NetFilterCounters() ([]NetFilterStat, error) { return nil, err } stats := make([]NetFilterStat, 0, 1) - + max, err := common.ReadInts(maxfile) if err != nil { return nil, err diff --git a/process/process_freebsd.go b/process/process_freebsd.go index ecd89204..857e1037 100644 --- a/process/process_freebsd.go +++ b/process/process_freebsd.go @@ -5,9 +5,9 @@ package process import ( "bytes" "encoding/binary" - "unsafe" "strings" "syscall" + "unsafe" cpu "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/internal/common" diff --git a/process/process_windows.go b/process/process_windows.go index d7a4b1cb..2f1f18fe 100644 --- a/process/process_windows.go +++ b/process/process_windows.go @@ -12,8 +12,8 @@ import ( "github.com/StackExchange/wmi" "github.com/shirou/w32" - "github.com/shirou/gopsutil/internal/common" cpu "github.com/shirou/gopsutil/cpu" + "github.com/shirou/gopsutil/internal/common" net "github.com/shirou/gopsutil/net" )