CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ping exit code handling on non-Linux (#7658)

This commit is contained in:
Nathan Ferch 2020-06-22 19:16:24 -04:00 committed by GitHub
parent b4bfecc95b
commit 423fc283ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/inputs/ping/ping_notwindows.go
View File

@ -21,9 +21,10 @@ func (p *Ping) pingToURL(u string, acc telegraf.Accumulator) {
out, err := p.pingHost(p.Binary, 60.0, p.args(u, runtime.GOOS)...) out, err := p.pingHost(p.Binary, 60.0, p.args(u, runtime.GOOS)...)
if err != nil { if err != nil {
// Some implementations of ping return a 1 exit code on // Some implementations of ping return a non-zero exit code on
// timeout, if this occurs we will not exit and try to parse // timeout, if this occurs we will not exit and try to parse
// the output. // the output.
// Linux iputils-ping returns 1, BSD-derived ping returns 2.
status := -1 status := -1
if exitError, ok := err.(*exec.ExitError); ok { if exitError, ok := err.(*exec.ExitError); ok {
if ws, ok := exitError.Sys().(syscall.WaitStatus); ok { if ws, ok := exitError.Sys().(syscall.WaitStatus); ok {
@ -32,7 +33,17 @@ func (p *Ping) pingToURL(u string, acc telegraf.Accumulator) {
} }
} }
if status != 1 { var timeoutExitCode int
switch runtime.GOOS {
case "freebsd", "netbsd", "openbsd", "darwin":
timeoutExitCode = 2
case "linux":
timeoutExitCode = 1
default:
timeoutExitCode = 1
}
if status != timeoutExitCode {
// Combine go err + stderr output // Combine go err + stderr output
out = strings.TrimSpace(out) out = strings.TrimSpace(out)
if len(out) > 0 { if len(out) > 0 {