mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remote write: read first line of response and include it in the error.

Browse source
This commit is contained in:
Tom Wilkie 2017-05-31 13:46:08 +01:00
parent 1c9499bbbd
commit 46abe8cbf2
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
storage/remote/client.go
View file

@ -14,6 +14,7 @@
package remote
import (
"bufio"
"bytes"
"fmt"
"io/ioutil"
@ -117,7 +118,12 @@ func (c *Client) Store(samples model.Samples) error {
defer httpResp.Body.Close()
if httpResp.StatusCode/100 != 2 {
err = fmt.Errorf("server returned HTTP status %s", httpResp.Status)
scanner := bufio.NewScanner(httpResp.Body)
line := ""
if scanner.Scan() {
line = scanner.Text()
}
err = fmt.Errorf("server returned HTTP status %s: %s", httpResp.Status, line)
}
if httpResp.StatusCode/100 == 5 {
return recoverableError{err}

8
storage/remote/client_test.go
View file

@ -37,15 +37,15 @@ func TestStoreHTTPErrorHandling(t *testing.T) {
},
{
code: 300,
err: fmt.Errorf("server returned HTTP status 300 Multiple Choices"),
err: fmt.Errorf("server returned HTTP status 300 Multiple Choices: test error"),
},
{
code: 404,
err: fmt.Errorf("server returned HTTP status 404 Not Found"),
err: fmt.Errorf("server returned HTTP status 404 Not Found: test error"),
},
{
code: 500,
err: recoverableError{fmt.Errorf("server returned HTTP status 500 Internal Server Error")},
err: recoverableError{fmt.Errorf("server returned HTTP status 500 Internal Server Error: test error")},
},
}
@ -68,7 +68,7 @@ func TestStoreHTTPErrorHandling(t *testing.T) {
err = c.Store(nil)
if !reflect.DeepEqual(err, test.err) {
t.Fatalf("%d. Unexpected error; want %v, got %v", i, test.err, err)
t.Errorf("%d. Unexpected error; want %v, got %v", i, test.err, err)
}
server.Close()