Skip to content
Open
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
8 changes: 4 additions & 4 deletions DepotDownloader/ContentDownloader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ private static async Task<DepotFilesData> ProcessDepotManifestAndFiles(Cancellat
break;
}

Console.WriteLine("Encountered error downloading depot manifest {0} {1}: {2}", depot.DepotId, depot.ManifestId, e.StatusCode);
Console.WriteLine("Encountered {2} for depot manifest {0} {1}. Retrying.", depot.DepotId, depot.ManifestId, e.StatusCode);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Console.WriteLine("Encountered {2} for depot manifest {0} {1}. Retrying.", depot.DepotId, depot.ManifestId, e.StatusCode);
Console.WriteLine("Encountered HTTP {2:D} for depot manifest {0} {1}. Retrying.", depot.DepotId, depot.ManifestId, e.StatusCode);

}
catch (OperationCanceledException)
{
Expand All @@ -843,7 +843,7 @@ private static async Task<DepotFilesData> ProcessDepotManifestAndFiles(Cancellat
catch (Exception e)
{
cdnPool.ReturnBrokenConnection(connection);
Console.WriteLine("Encountered error downloading manifest for depot {0} {1}: {2}", depot.DepotId, depot.ManifestId, e.Message);
Console.WriteLine("Error downloading manifest for depot {0} {1}: {2} Retrying.", depot.DepotId, depot.ManifestId, e.Message);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Console.WriteLine("Error downloading manifest for depot {0} {1}: {2} Retrying.", depot.DepotId, depot.ManifestId, e.Message);
Console.WriteLine("Error downloading manifest for depot {0} {1}: {2} Retrying...", depot.DepotId, depot.ManifestId, e.Message);

}
} while (newManifest == null);

Expand Down Expand Up @@ -1258,7 +1258,7 @@ private static async Task DownloadSteam3AsyncDepotFileChunk(
break;
}

Console.WriteLine("Encountered error downloading chunk {0}: {1}", chunkID, e.StatusCode);
Console.WriteLine("Encountered {1} for chunk {0}. Retrying.", chunkID, e.StatusCode);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Console.WriteLine("Encountered {1} for chunk {0}. Retrying.", chunkID, e.StatusCode);
Console.WriteLine("Encountered HTTP {1:D} for chunk {0}. Retrying...", chunkID, e.StatusCode);

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is definitely not gonna be work out, because StatusCode is a value like ServiceUnavailable or NotFound from what I've observed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want the integer value (:D e.g. 503), or the enum name (:G eg ServiceUnavailable)?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Encountered ServiceUnavailable makes more sense and keeps it roughly identical to what it was. Encountered HTTP 503 doesn't mean a whole lot to anyone who hasn't studied the HTTP RFCs.

}
catch (OperationCanceledException)
{
Expand All @@ -1267,7 +1267,7 @@ private static async Task DownloadSteam3AsyncDepotFileChunk(
catch (Exception e)
{
cdnPool.ReturnBrokenConnection(connection);
Console.WriteLine("Encountered unexpected error downloading chunk {0}: {1}", chunkID, e.Message);
Console.WriteLine("Error downloading chunk {0}: {1} Retrying.", chunkID, e.Message);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Console.WriteLine("Error downloading chunk {0}: {1} Retrying.", chunkID, e.Message);
Console.WriteLine("Error downloading chunk {0}: {1} Retrying...", chunkID, e.Message);

}
} while (written == 0);

Expand Down