Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More debug logging #139

Merged
merged 8 commits into from
Nov 23, 2023
Merged

More debug logging #139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
24e5a76
More debug logging
edsu Nov 1, 2023
8077809
Update wayback/_client.py
edsu Nov 3, 2023
4fda3de
Update wayback/_utils.py
edsu Nov 3, 2023
172ee7d
removing log messages that trigger exceptions
edsu Nov 3, 2023
e849db3
Add more detail to logs
Mr0grog Nov 22, 2023
3ae4623
Only log the exception if we swallowed it
Mr0grog Nov 22, 2023
df76c14
Log when HTTP response errors are retried
Mr0grog Nov 23, 2023
a06cc35
Fix quotes
Mr0grog Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions wayback/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,17 +400,21 @@ def send(self, *args, **kwargs):
retries = 0
while True:
try:
logger.debug("sending %s", kwargs)
result = super().send(*args, **kwargs)
if retries >= maximum or not self.should_retry(result):
if result.status_code == 429:
logger.warning("caught rate limit error: %s", result.content)
Mr0grog marked this conversation as resolved.
Show resolved Hide resolved
raise RateLimitError(result)
return result
except WaybackSession.handleable_errors as error:
logger.warn("caught exception during request: %s", error)
response = getattr(error, 'response', None)
if response:
read_and_close(response)

if retries >= maximum:
logger.error("Too many retries %s >= %s", retries, maximum)
edsu marked this conversation as resolved.
Show resolved Hide resolved
raise WaybackRetryError(retries, total_time, error) from error
elif not self.should_retry_error(error):
raise
Expand All @@ -419,6 +423,7 @@ def send(self, *args, **kwargs):
if retries > 0:
seconds = self.backoff * 2 ** (retries - 1)
total_time += seconds
logger.debug("retrying after sleep of %s seconds", seconds)
edsu marked this conversation as resolved.
Show resolved Hide resolved
time.sleep(seconds)

retries += 1
Expand Down Expand Up @@ -712,6 +717,7 @@ def search(self, url, *, match_type=None, limit=1000, offset=None,
sent_query, next_query = next_query, None
with _utils.rate_limited(self.session.search_calls_per_second,
group='search'):
logger.debug("querying %s %s", CDX_SEARCH_URL, sent_query)
edsu marked this conversation as resolved.
Show resolved Hide resolved
response = self.session.request('GET', CDX_SEARCH_URL,
params=sent_query)
try:
Expand Down
4 changes: 3 additions & 1 deletion wayback/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,9 @@ def rate_limited(calls_per_second=2, group='default'):
minimum_wait = 1.0 / calls_per_second
current_time = time.time()
if current_time - last_call < minimum_wait:
time.sleep(minimum_wait - (current_time - last_call))
secs = minimum_wait - (current_time - last_call)
logger.debug("sleeping %s", secs)
edsu marked this conversation as resolved.
Show resolved Hide resolved
time.sleep(secs)
_last_call_by_group[group] = time.time()
yield

Expand Down