Merge pull request #1895 from python-gitlab/jlvillal/rate-limit

nejch · web-flow · commit 114958eb9f48 · 2022-03-10T14:39:09.000+11:00
fix: support RateLimit-Reset header
diff --git a/gitlab/client.py b/gitlab/client.py
@@ -700,10 +700,14 @@ def http_request(
             if (429 == result.status_code and obey_rate_limit) or (
                 result.status_code in [500, 502, 503, 504] and retry_transient_errors
             ):
+                # Response headers documentation:
+                # https://docs.gitlab.com/ee/user/admin_area/settings/user_and_ip_rate_limits.html#response-headers
                 if max_retries == -1 or cur_retries < max_retries:
                     wait_time = 2**cur_retries * 0.1
                     if "Retry-After" in result.headers:
                         wait_time = int(result.headers["Retry-After"])
+                    elif "RateLimit-Reset" in result.headers:
+                        wait_time = int(result.headers["RateLimit-Reset"]) - time.time()
                     cur_retries += 1
                     time.sleep(wait_time)
                     continue
