Merge pull request #362 from jepler/fix-ratelimit-timezone

Fix ratelimit timezone
adafruit · Nov 27, 2023 · b08b400 · b08b400
2 parents e55f7f5 + f2daf93
commit b08b400
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/adabot/circuitpython_libraries.py b/adabot/circuitpython_libraries.py
@@ -257,7 +257,7 @@ def run_library_checks(validators, kw_args, error_depth):
             break
         except pygithub.RateLimitExceededException:
             core_rate_limit_reset = GH_INTERFACE.get_rate_limit().core.reset
-            sleep_time = core_rate_limit_reset - datetime.datetime.now()
+            sleep_time = core_rate_limit_reset - datetime.datetime.utcnow()
             logging.warning("Rate Limit will reset at: %s", core_rate_limit_reset)
             time.sleep(sleep_time.seconds)
             continue

diff --git a/adabot/github_requests.py b/adabot/github_requests.py
@@ -92,6 +92,11 @@ def request(method, url, **kwargs):
         logging.warning(
             "GitHub API Rate Limit reached. Pausing until Rate Limit reset."
         )
+        # This datetime.now() is correct, *because* `fromtimestamp` above
+        # converts the timestamp into local time, same as now(). This is
+        # different than the sites that use GH_INTERFACE.get_rate_limit, in
+        # which the rate limit is a UTC time, so it has to be compared to
+        # utcnow.
         while datetime.datetime.now() < rate_limit_reset:
             logging.warning("Rate Limit will reset at: %s", rate_limit_reset)
             reset_diff = rate_limit_reset - datetime.datetime.now()

diff --git a/adabot/lib/bundle_announcer.py b/adabot/lib/bundle_announcer.py
@@ -80,7 +80,7 @@ def get_bundle_updates(full_repo_name: str) -> Tuple[Set[RepoResult], Set[RepoRe
 
         except pygithub.RateLimitExceededException:
             core_rate_limit_reset = GH_INTERFACE.get_rate_limit().core.reset
-            sleep_time = core_rate_limit_reset - datetime.datetime.now()
+            sleep_time = core_rate_limit_reset - datetime.datetime.utcnow()
             logging.warning("Rate Limit will reset at: %s", core_rate_limit_reset)
             time.sleep(sleep_time.seconds)
             continue

diff --git a/adabot/lib/circuitpython_library_validators.py b/adabot/lib/circuitpython_library_validators.py
@@ -916,7 +916,7 @@ def validate_readthedocs(self, repo):
                 break
             except pygithub.RateLimitExceededException:
                 core_rate_limit_reset = GH_INTERFACE.get_rate_limit().core.reset
-                sleep_time = core_rate_limit_reset - datetime.datetime.now()
+                sleep_time = core_rate_limit_reset - datetime.datetime.utcnow()
                 logging.warning("Rate Limit will reset at: %s", core_rate_limit_reset)
                 time.sleep(sleep_time.seconds)
                 continue
@@ -1275,7 +1275,7 @@ def validate_actions_state(self, repo):
                 return []
             except pygithub.RateLimitExceededException:
                 core_rate_limit_reset = GH_INTERFACE.get_rate_limit().core.reset
-                sleep_time = core_rate_limit_reset - datetime.datetime.now()
+                sleep_time = core_rate_limit_reset - datetime.datetime.utcnow()
                 logging.warning("Rate Limit will reset at: %s", core_rate_limit_reset)
                 time.sleep(sleep_time.seconds)