izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Catch I/O exceptions if downloading fails: can be caused by web streams, not just file I/O. Also tidy up output a little.

Browse Source 
[CL 2348491 by Ben Marsh in Main branch]
This commit is contained in:
Ben Marsh
2014-11-04 11:21:05 -05:00
committed by UnrealBot
parent de481c4163
commit 5e0b64a707
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Engine/Binaries/DotNET/GitDependencies.exe
View File

Binary file not shown.

15
Engine/Source/Programs/GitDependencies/Program.cs
View File

@@ -352,8 +352,6 @@ namespace GitDependencies
// If there's nothing to do, just print a simpler message and exit early
if(FilesToDownload.Count > 0)
{
Log.WriteLine("Downloading {0} files using {1} threads...", FilesToDownload.Count, NumThreads);
// Download all the new dependencies
if(!DownloadDependencies(RootPath, FilesToDownload, TargetBlobs.Values, TargetPacks.Values, NumThreads, MaxRetries))
{
@@ -490,7 +488,7 @@ namespace GitDependencies
// Download the file, decompressing and hashing it as we go.
for(int NumAttempts = 0;;)
{
string ExceptionMessage;
Exception CaughtException;
// Try to download the file
long RollbackSize = 0;
@@ -502,19 +500,24 @@ namespace GitDependencies
catch(InvalidDataException Ex)
{
// The downloaded file was corrupt
ExceptionMessage = Ex.Message;
CaughtException = Ex;
}
catch(IOException Ex)
{
// Couldn't read/write from the stream or file
CaughtException = Ex;
}
catch(WebException Ex)
{
// Error while downloading the file
ExceptionMessage = Ex.Message;
CaughtException = Ex;
}
Interlocked.Add(ref State.NumBytesRead, -RollbackSize);
// Bail out after retrying
if(++NumAttempts == MaxRetries)
{
throw new Exception(String.Format("Failed to download '{0}' to '{1}' after {2} attempts: {3}", BundleUrl, PackFileName, NumAttempts, ExceptionMessage));
throw new Exception(String.Format("Failed to download '{0}' to '{1}' after {2} attempts: {3} ({4})", BundleUrl, PackFileName, NumAttempts, CaughtException.Message, CaughtException.GetType().Name));
}
}