Skip to content

Retry downloading a package #1198

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

Merged
dlang-bot merged 5 commits into from
Aug 26, 2017
Merged

Retry downloading a package #1198

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c6038b
Merge pull request #2 from D-Programming-Language/master
grogancolin Feb 19, 2015
fb03d3e
Merge remote-tracking branch 'upstream/master'
grogancolin Jul 15, 2017
f5ed558
Try 3 times to download a package/metadata
grogancolin Jul 15, 2017
f6db3b3
Always throw for 404 errors.
s-ludwig Jul 26, 2017
e4859dd
Remove unused import.
s-ludwig Aug 26, 2017
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
41 changes: 32 additions & 9 deletions source/dub/packagesupplier.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,20 @@ class RegistryPackageSupplier : PackageSupplier {
auto vers = best["version"].get!string;
auto url = m_registryUrl ~ Path(PackagesPath~"/"~packageId~"/"~vers~".zip");
logDiagnostic("Downloading from '%s'", url);
download(url, path);
foreach(i; 0..3) {
try{
download(url, path);
return;
}
catch(HTTPStatusException e) {
if (e.status == 404) throw e;
else {
logDebug("Failed to download package %s from %s (Attempt %s of 3)", packageId, url, i + 1);
continue;
}
}
}
throw new Exception("Failed to download package %s from %s".format(packageId, url));
}

Json fetchPackageRecipe(string packageId, Dependency dep, bool pre_release)
Expand All @@ -214,14 +227,24 @@ class RegistryPackageSupplier : PackageSupplier {
logDebug("Getting from %s", url);

string jsonData;
try
jsonData = cast(string)download(url);
catch (HTTPStatusException e)
{
if (e.status != 404)
throw e;
logDebug("Package %s not found in %s: %s", packageId, description, e.msg);
return Json(null);
foreach(i; 0..3) {
try {
jsonData = cast(string)download(url);
break;
}
catch (HTTPStatusException e)
{
if (e.status == 404) {
logDebug("Package %s not found at %s (404): %s", packageId, description, e.msg);
return Json(null);
}
else {
logDebug("Error getting metadata for package %s at %s (attempt %s of 3): %s", packageId, description, i + 1, e.msg);
if (i == 2)
throw e;
continue;
}
}
}
Json json = parseJsonString(jsonData, url.toString());
// strip readme data (to save size and time)
Expand Down