Commit4060146

committed

fix: support RateLimit-Reset header

Some endpoints are not returning the `Retry-After` header whenrate-limiting occurrs. In those cases use the `RateLimit-Reset` [1]header, if available.Closes:#1889[1]https://docs.gitlab.com/ee/user/admin_area/settings/user_and_ip_rate_limits.html#response-headers

1 parent85a734f commit4060146Copy full SHA for 4060146

File tree

-0

lines changed

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -700,10 +700,14 @@ def http_request(`
`700`	`700`	`if (429==result.status_codeandobey_rate_limit)or (`
`701`	`701`	`result.status_codein [500,502,503,504]andretry_transient_errors`
`702`	`702`	`):`
	`703`	`+# Response headers documentation:`
	`704`	`+# https://docs.gitlab.com/ee/user/admin_area/settings/user_and_ip_rate_limits.html#response-headers`
`703`	`705`	`ifmax_retries==-1orcur_retries<max_retries:`
`704`	`706`	`wait_time=2*cur_retries0.1`
`705`	`707`	`if"Retry-After"inresult.headers:`
`706`	`708`	`wait_time=int(result.headers["Retry-After"])`
	`709`	`+elif"RateLimit-Reset"inresult.headers:`
	`710`	`+wait_time=int(result.headers["RateLimit-Reset"])-time.time()`
`707`	`711`	`cur_retries+=1`
`708`	`712`	`time.sleep(wait_time)`
`709`	`713`	`continue`

Comments

(0)