mirror
/
client_golang
mirror of https://github.com/prometheus/client_golang.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #731 from huanggze/master 

Improve API error handling
This commit is contained in:
Björn Rabenstein 2020-04-03 16:23:26 +02:00 committed by GitHub
parent aa9238db67 8f87c69651
commit 70a94c09a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/prometheus/v1/api.go
View File

@ -905,14 +905,14 @@ func (h *apiClientImpl) Do(ctx context.Context, req *http.Request) (*http.Respon
} }
} }
if apiError(code) != (result.Status == "error") { if apiError(code) && result.Status == "success" {
err = &Error{ err = &Error{
Type: ErrBadResponse, Type: ErrBadResponse,
Msg: "inconsistent body for response code", Msg: "inconsistent body for response code",
} }
} }
if apiError(code) && result.Status == "error" { if result.Status == "error" {
err = &Error{ err = &Error{
Type: result.ErrorType, Type: result.ErrorType,
Msg: result.Error, Msg: result.Error,

8
api/prometheus/v1/api_test.go
View File

@ -1095,8 +1095,8 @@ func TestAPIClientDo(t *testing.T) {
Error: "timed out", Error: "timed out",
}, },
expectedErr: &Error{ expectedErr: &Error{
Type: ErrBadResponse, Type: ErrTimeout,
Msg: "inconsistent body for response code", Msg: "timed out",
}, },
}, },
{ {
@ -1109,8 +1109,8 @@ func TestAPIClientDo(t *testing.T) {
Warnings: []string{"a"}, Warnings: []string{"a"},
}, },
expectedErr: &Error{ expectedErr: &Error{
Type: ErrBadResponse, Type: ErrTimeout,
Msg: "inconsistent body for response code", Msg: "timed out",
}, },
expectedWarnings: []string{"a"}, expectedWarnings: []string{"a"},
}, },