microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 16:58:55 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

fixes #11779

Browse Source
This commit is contained in:
Joao Moreno
2016-09-28 14:37:51 +02:00
parent 6afb0f477a
commit 75a03bdecf
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/base/common/errors.ts
View File

@@ -168,4 +168,20 @@ export function create(message: string, options: IErrorOptions = {}): Error {
}
return result;
}
export function getErrorMessage(err: any): string {
if (!err) {
return 'Error';
}
if (err.message) {
return err.message;
}
if (err.stack) {
return err.stack.split('\n')[0];
}
return String(err);
}

13
src/vs/platform/extensionManagement/node/extensionGalleryService.ts
View File

@@ -8,6 +8,7 @@ import { tmpdir } from 'os';
import * as path from 'path';
import { TPromise } from 'vs/base/common/winjs.base';
import { distinct } from 'vs/base/common/arrays';
import { getErrorMessage } from 'vs/base/common/errors';
import { ArraySet } from 'vs/base/common/set';
import { IGalleryExtension, IExtensionGalleryService, IQueryOptions, SortBy, SortOrder, IExtensionManifest } from 'vs/platform/extensionManagement/common/extensionManagement';
import { getGalleryExtensionTelemetryData } from 'vs/platform/extensionManagement/common/extensionTelemetry';
@@ -489,12 +490,18 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
parsedUrl.query['redirect'] = 'true';
const cdnUrl = url.format(parsedUrl);
const cdnOptions = assign({}, options, { url: cdnUrl });
return this.requestService.request(assign({}, options, { url: cdnUrl }))
return this.requestService.request(cdnOptions)
.then(context => context.res.statusCode === 200 ? context : TPromise.wrapError('expected 200'))
.then(null, () => {
.then(null, err => {
this.telemetryService.publicLog('galleryService:requestError', { cdn: true, message: getErrorMessage(err) });
this.telemetryService.publicLog('galleryService:cdnFallback', { url: cdnUrl });
return this.requestService.request(options);
return this.requestService.request(options).then(null, err => {
this.telemetryService.publicLog('galleryService:requestError', { cdn: false, message: getErrorMessage(err) });
return TPromise.wrapError(err);
});
});
}