re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #654 from prometheus/beorn7/push 

Minor improvements to the push code
This commit is contained in:
Björn Rabenstein 2019-10-15 11:41:22 +02:00 committed by GitHub
parent 3ddc3cfbe5 bd362a9ced
commit e0e84de036
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
prometheus/push/push.go
View File

@ -220,7 +220,7 @@ func (p *Pusher) Delete() error {
return err return err
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != 202 { if resp.StatusCode != http.StatusAccepted {
body, _ := ioutil.ReadAll(resp.Body) // Ignore any further error as this is for an error message only. body, _ := ioutil.ReadAll(resp.Body) // Ignore any further error as this is for an error message only.
return fmt.Errorf("unexpected status code %d while deleting %s: %s", resp.StatusCode, p.fullURL(), body) return fmt.Errorf("unexpected status code %d while deleting %s: %s", resp.StatusCode, p.fullURL(), body)
} }
@ -267,7 +267,8 @@ func (p *Pusher) push(method string) error {
return err return err
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != 200 && resp.StatusCode != 202 { // Pushgateway 0.10+ responds with StatusOK, earlier versions with StatusAccepted.
if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusAccepted {
body, _ := ioutil.ReadAll(resp.Body) // Ignore any further error as this is for an error message only. body, _ := ioutil.ReadAll(resp.Body) // Ignore any further error as this is for an error message only.
return fmt.Errorf("unexpected status code %d while pushing to %s: %s", resp.StatusCode, p.fullURL(), body) return fmt.Errorf("unexpected status code %d while pushing to %s: %s", resp.StatusCode, p.fullURL(), body)
} }

9
prometheus/push/push_test.go
View File

@ -33,7 +33,8 @@ func TestPush(t *testing.T) {
lastPath string lastPath string
) )
// Fake a Pushgateway that always responds with 202. // Fake a Pushgateway that responds with 202 to DELETE and with 200 in
// all other cases.
pgwOK := httptest.NewServer( pgwOK := httptest.NewServer(
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
lastMethod = r.Method lastMethod = r.Method
@ -44,7 +45,11 @@ func TestPush(t *testing.T) {
} }
lastPath = r.URL.EscapedPath() lastPath = r.URL.EscapedPath()
w.Header().Set("Content-Type", `text/plain; charset=utf-8`) w.Header().Set("Content-Type", `text/plain; charset=utf-8`)
w.WriteHeader(http.StatusAccepted) if r.Method == http.MethodDelete {
w.WriteHeader(http.StatusAccepted)
return
}
w.WriteHeader(http.StatusOK)
}), }),
) )
defer pgwOK.Close() defer pgwOK.Close()