Improve API error handling

Signed-off-by: huanggze <loganhuang@yunify.com>
prometheus · Apr 2, 2020 · 8f87c69 · 8f87c69
1 parent aa9238d
commit 8f87c69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/api/prometheus/v1/api.go b/api/prometheus/v1/api.go
@@ -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{
 			Type: ErrBadResponse,
 			Msg:  "inconsistent body for response code",
 		}
 	}
 
-	if apiError(code) && result.Status == "error" {
+	if result.Status == "error" {
 		err = &Error{
 			Type: result.ErrorType,
 			Msg:  result.Error,

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