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

proxy: show output instead of errcode when repeated trying

Browse Source
This commit is contained in:
Lan Tian 2020-09-20 00:31:15 +08:00
parent 1a8c7b6e6b
commit 254b967159
No known key found for this signature in database
GPG Key ID: 27F31700E751EC22
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
proxy/traceroute.go
View File

@ -30,9 +30,9 @@ func tracerouteTryExecute(cmd []string, args [][]string) ([]byte, string) {
if err == nil { if err == nil {
return output, "" return output, ""
} }
errString += fmt.Sprintf("+ (Try %d) %s\n%s\n\n", (i + 1), cmdCombined, err.Error()) errString += fmt.Sprintf("+ (Try %d) %s\n%s\n\n", (i + 1), cmdCombined, output)
} }
return output, errString return nil, errString
} }
// Real handler of traceroute requests // Real handler of traceroute requests
@ -133,8 +133,10 @@ func tracerouteRealHandler(useIPv6 bool, httpW http.ResponseWriter, httpR *http.
} }
if errString != "" { if errString != "" {
httpW.WriteHeader(http.StatusInternalServerError) httpW.WriteHeader(http.StatusInternalServerError)
httpW.Write([]byte("traceroute returned error:\n" + errString)) httpW.Write([]byte("traceroute returned error:\n\n" + errString))
}
if result != nil {
httpW.Write(result)
} }
httpW.Write(result)
} }
} }