github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9029 from zhsj/sysctl 

sdk: read procfs instead of using sysctl command
pull/9491/head
Daniel Nephin 2021-01-04 14:13:33 -05:00 committed by GitHub
parent 85e5da53d5 b931e989b8
commit d32e7f0857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/freeport/ephemeral_linux.go
View File

@ -4,18 +4,17 @@ package freeport
import ( import (
"fmt" "fmt"
"os/exec" "io/ioutil"
"regexp" "regexp"
"strconv" "strconv"
) )
const ephemeralPortRangeSysctlKey = "net.ipv4.ip_local_port_range" const ephemeralPortRangeProcFile = "/proc/sys/net/ipv4/ip_local_port_range"
var ephemeralPortRangePatt = regexp.MustCompile(`^\s*(\d+)\s+(\d+)\s*$`) var ephemeralPortRangePatt = regexp.MustCompile(`^\s*(\d+)\s+(\d+)\s*$`)
func getEphemeralPortRange() (int, int, error) { func getEphemeralPortRange() (int, int, error) {
cmd := exec.Command("/sbin/sysctl", "-n", ephemeralPortRangeSysctlKey) out, err := ioutil.ReadFile(ephemeralPortRangeProcFile)
out, err := cmd.Output()
if err != nil { if err != nil {
return 0, 0, err return 0, 0, err
} }
@ -32,5 +31,5 @@ func getEphemeralPortRange() (int, int, error) {
} }
} }
return 0, 0, fmt.Errorf("unexpected sysctl value %q for key %q", val, ephemeralPortRangeSysctlKey) return 0, 0, fmt.Errorf("unexpected sysctl value %q for key %q", val, ephemeralPortRangeProcFile)
} }