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.

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

Fix load_url retry for binary streams #192

Merged
merged 1 commit into from
Oct 19, 2024
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/rosdistro/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ def load_url(url, retry=2, retry_period=1, timeout=10, skip_decode=False):
except HTTPError as e:
if e.code in [500, 502, 503] and retry:
time.sleep(retry_period)
return load_url(url, retry=retry - 1, retry_period=retry_period, timeout=timeout)
return load_url(url, retry=retry - 1, retry_period=retry_period, timeout=timeout, skip_decode=skip_decode)
e.msg += ' (%s)' % url
raise
except URLError as e:
if isinstance(e.reason, socket.timeout) and retry:
time.sleep(retry_period)
return load_url(url, retry=retry - 1, retry_period=retry_period, timeout=timeout)
return load_url(url, retry=retry - 1, retry_period=retry_period, timeout=timeout, skip_decode=skip_decode)
raise URLError(str(e) + ' (%s)' % url)
except socket.timeout as e:
raise socket.timeout(str(e) + ' (%s)' % url)
Expand Down
Loading