Skip to content

ignore update failures caused by no network present #2808

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
bobbrow merged 3 commits into from
Nov 13, 2018
Merged

ignore update failures caused by no network present #2808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aa094c
ignore update failures caused by no network present
bobbrow Nov 11, 2018
82eef3c
Add comments
bobbrow Nov 12, 2018
ffc4773
fix comment
bobbrow Nov 13, 2018
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 Extension/src/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,10 +630,10 @@ export function downloadFileToDestination(urlStr: string, destinationPath: strin
// Write file using downloaded data
let createdFile: fs.WriteStream = fs.createWriteStream(destinationPath);
createdFile.on('finish', () => { resolve(); });
response.on('error', (error) => { reject(); });
response.on('error', (error) => { reject(error); });
response.pipe(createdFile);
});
request.on('error', (error) => { reject(); });
request.on('error', (error) => { reject(error); });
request.end();
});
}
Expand Down Expand Up @@ -663,10 +663,10 @@ export function downloadFileToStr(urlStr: string, headers?: OutgoingHttpHeaders)
}
let downloadedData: string = '';
response.on('data', (data) => { downloadedData += data; });
response.on('error', (error) => { reject(); });
response.on('error', (error) => { reject(error); });
response.on('end', () => { resolve(downloadedData); });
});
request.on('error', (error) => { reject(); });
request.on('error', (error) => { reject(error); });
request.end();
});
}
22 changes: 19 additions & 3 deletions Extension/src/githubAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,15 @@ function isRateLimit(input: any): input is RateLimit {
async function getRateLimit(): Promise<RateLimit> {
const header: OutgoingHttpHeaders = { 'User-Agent': 'vscode-cpptools' };
const data: string = await util.downloadFileToStr('https://api.github.com/rate_limit', header)
.catch(() => { throw new Error('Failed to download rate limit JSON'); });
.catch((error) => {
if (error.code && error.code !== "ENOENT") {
// Only throw if the user is connected to the Internet.
throw new Error('Failed to download rate limit JSON');
}
});
if (!data) {
return Promise.resolve(null);
}

let rateLimit: any;
try {
Expand All @@ -229,7 +237,7 @@ async function getRateLimit(): Promise<RateLimit> {

async function rateLimitExceeded(): Promise<boolean> {
const rateLimit: RateLimit = await getRateLimit();
return rateLimit.rate.remaining <= 0;
return rateLimit && rateLimit.rate.remaining <= 0;
}

/**
Expand All @@ -246,7 +254,15 @@ async function getReleaseJson(): Promise<Build[]> {
const header: OutgoingHttpHeaders = { 'User-Agent': 'vscode-cpptools' };

const data: string = await util.downloadFileToStr(releaseUrl, header)
.catch(() => { throw new Error('Failed to download release JSON'); });
.catch((error) => {
if (error.code && error.code !== "ENOENT") {
// Only throw if the user is connected to the Internet.
throw new Error('Failed to download release JSON');
}
});
if (!data) {
return Promise.resolve(null);
}

// Parse the file
let releaseJson: any;
Expand Down