Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #74661

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-06-04 12:30:04 +02:00
parent f256ab1c1e
commit 3dc76ed11f
7 changed files with 99 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
View File

@@ -79,7 +79,7 @@ class MainProcessService implements IMainProcessService {
}
}
function main(server: Server, initData: ISharedProcessInitData, configuration: ISharedProcessConfiguration): void {
async function main(server: Server, initData: ISharedProcessInitData, configuration: ISharedProcessConfiguration): Promise<void> {
const services = new ServiceCollection();
const disposables: IDisposable[] = [];
@@ -96,12 +96,15 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', mainRouter));
const logService = new FollowerLogService(logLevelClient, new SpdLogService('sharedprocess', environmentService.logsPath, initData.logLevel));
disposables.push(logService);
logService.info('main', JSON.stringify(configuration));
const configurationService = new ConfigurationService(environmentService.appSettingsPath);
disposables.push(configurationService);
await configurationService.initialize();
services.set(IEnvironmentService, environmentService);
services.set(ILogService, logService);
services.set(IConfigurationService, new SyncDescriptor(ConfigurationService, [environmentService.appSettingsPath]));
services.set(IConfigurationService, configurationService);
services.set(IRequestService, new SyncDescriptor(RequestService));
services.set(IDownloadService, new SyncDescriptor(DownloadService));
@@ -218,6 +221,6 @@ async function handshake(configuration: ISharedProcessConfiguration): Promise<vo
const server = await setupIPC(data.sharedIPCHandle);
main(server, data, configuration);
await main(server, data, configuration);
ipcRenderer.send('handshake:im ready');
}