Merge pull request #701 from wcc526/patch-5

Fix unhandled io.EOF error in net.ConnectionsMax
pull/720/head
Lomanic 6 years ago committed by GitHub
commit fd0ebc6e03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -14,6 +14,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"syscall" "syscall"
"io"
"github.com/shirou/gopsutil/internal/common" "github.com/shirou/gopsutil/internal/common"
) )
@ -653,7 +654,7 @@ func getProcInodesAll(root string, max int) (map[string][]inodeMap, error) {
t, err := getProcInodes(root, pid, max) t, err := getProcInodes(root, pid, max)
if err != nil { if err != nil {
// skip if permission error or no longer exists // skip if permission error or no longer exists
if os.IsPermission(err) || os.IsNotExist(err) { if os.IsPermission(err) || os.IsNotExist(err) || err == io.EOF {
continue continue
} }
return ret, err return ret, err

Loading…
Cancel
Save