github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-02-09 15:27:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/promscrape: adds correct http status codes for redirect (#2530)

Browse source 
standard http client accepts multiple http status codes as redirect
it should fix issue with incorrect redirects
https://github.com/VictoriaMetrics/VictoriaMetrics/issues/2482
This commit is contained in:
Nikolay 2022-05-03 12:31:31 +02:00 committed by Aliaksandr Valialkin
parent ec3a37896f
commit 51a77759c1
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/promscrape/client.go
View file

@ -201,6 +201,15 @@ func (c *client) GetStreamReader() (*streamReader, error) {
}, nil }, nil
} }
// checks fasthttp status code for redirect as standard http/client does.
func isStatusRedirect(statusCode int) bool {
switch statusCode {
case 301, 302, 303, 307, 308:
return true
}
return false
}
func (c *client) ReadData(dst []byte) ([]byte, error) { func (c *client) ReadData(dst []byte) ([]byte, error) {
deadline := time.Now().Add(c.hc.ReadTimeout) deadline := time.Now().Add(c.hc.ReadTimeout)
req := fasthttp.AcquireRequest() req := fasthttp.AcquireRequest()
@ -237,7 +246,7 @@ func (c *client) ReadData(dst []byte) ([]byte, error) {
err := doRequestWithPossibleRetry(c.hc, req, resp, deadline) err := doRequestWithPossibleRetry(c.hc, req, resp, deadline)
statusCode := resp.StatusCode() statusCode := resp.StatusCode()
redirectsCount := 0 redirectsCount := 0
for err == nil && (statusCode == fasthttp.StatusMovedPermanently || statusCode == fasthttp.StatusFound) { for err == nil && isStatusRedirect(statusCode) {
if redirectsCount > 5 { if redirectsCount > 5 {
err = fmt.Errorf("too many redirects") err = fmt.Errorf("too many redirects")
break break