Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix panic when influx client receives error status code

pull/154/head
Chris Goller 2016-09-30 10:31:20 -05:00
parent 2ef4a7b13d
commit 7d95840956
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
influx/influx.go
View File

@ -59,6 +59,9 @@ func query(u *url.URL, q mrfusion.Query) (mrfusion.Response, error) {
return nil, err return nil, err
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("received status code %d from server", resp.StatusCode)
}
var response Response var response Response
dec := json.NewDecoder(resp.Body) dec := json.NewDecoder(resp.Body)
@ -73,6 +76,7 @@ func query(u *url.URL, q mrfusion.Query) (mrfusion.Response, error) {
if decErr != nil { if decErr != nil {
return nil, fmt.Errorf("unable to decode json: received status code %d err: %s", resp.StatusCode, decErr) return nil, fmt.Errorf("unable to decode json: received status code %d err: %s", resp.StatusCode, decErr)
} }
// If we don't have an error in our json response, and didn't get statusOK // If we don't have an error in our json response, and didn't get statusOK
// then send back an error // then send back an error
if resp.StatusCode != http.StatusOK && response.Err != "" { if resp.StatusCode != http.StatusOK && response.Err != "" {