daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

timeout and catch error (#164169)

pull/164179/head
Sandeep Somavarapu 2022-10-20 22:33:05 +02:00 committed by GitHub
parent 903c645dfd
commit f024efc271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/vs/workbench/browser/web.main.ts
View File

@ -81,6 +81,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
import { BrowserUserDataProfilesService } from 'vs/platform/userDataProfile/browser/userDataProfile';
import { timeout } from 'vs/base/common/async';
export class BrowserMain extends Disposable {
@ -363,6 +364,20 @@ export class BrowserMain extends Disposable {
const userDataInitializationService = new UserDataInitializationService(environmentService, credentialsService, userDataSyncStoreManagementService, fileService, userDataProfilesService, storageService, productService, requestService, logService, uriIdentityService);
serviceCollection.set(IUserDataInitializationService, userDataInitializationService);
try {
await Promise.race([
// Do not block more than 5s
timeout(5000),
this.initializeUserData(userDataInitializationService, configurationService)]
);
} catch (error) {
logService.error(error);
}
return { serviceCollection, configurationService, logService };
}
private async initializeUserData(userDataInitializationService: UserDataInitializationService, configurationService: WorkspaceService) {
if (await userDataInitializationService.requiresInitialization()) {
mark('code/willInitRequiredUserData');
@ -375,8 +390,6 @@ export class BrowserMain extends Disposable {
mark('code/didInitRequiredUserData');
}
return { serviceCollection, configurationService, logService };
}
private async registerFileSystemProviders(environmentService: IWorkbenchEnvironmentService, fileService: IWorkbenchFileService, remoteAgentService: IRemoteAgentService, logService: BufferLogService, loggerService: ILoggerService, logsPath: URI): Promise<void> {