burble.dn42/bird-lg-go
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Small change on lgproxy traceroute error notification

Browse Source
This commit is contained in:
Lan Tian 2020-03-27 16:41:28 +08:00
parent cb247186f3
commit f204744a4f
No known key found for this signature in database
GPG Key ID: 27F31700E751EC22
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/traceroute.go
View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"fmt"
"net/http" "net/http"
"os/exec" "os/exec"
"runtime" "runtime"
@ -47,7 +48,7 @@ func tracerouteRealHandler(useIPv6 bool, httpW http.ResponseWriter, httpR *http.
} }
} else { } else {
httpW.WriteHeader(http.StatusInternalServerError) httpW.WriteHeader(http.StatusInternalServerError)
httpW.Write([]byte("Traceroute Not Supported\n")) httpW.Write([]byte("traceroute binary not installed on this node.\n"))
return return
} }
instance := exec.Command(cmd, args...) instance := exec.Command(cmd, args...)
@ -66,8 +67,7 @@ func tracerouteRealHandler(useIPv6 bool, httpW http.ResponseWriter, httpR *http.
} }
if err != nil { if err != nil {
httpW.WriteHeader(http.StatusInternalServerError) httpW.WriteHeader(http.StatusInternalServerError)
httpW.Write([]byte("Traceroute Execution Error: ")) httpW.Write([]byte(fmt.Sprintln("traceroute returned error:", err.Error(), ", please check if IPv4/IPv6 is selected correctly on top.")))
httpW.Write([]byte(err.Error() + "\n"))
return return
} }
httpW.Write(output) httpW.Write(output)