maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

acquire the mainLockFile asynchonrously

Browse source 
For #128366
This commit is contained in:
Connor Peet 2021-07-22 08:44:45 -07:00
parent 4a92332728
commit 66b231db13
No known key found for this signature in database
GPG key ID: CF8FD2EA0DBC61BD
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/code/electron-main/main.ts
View file

@ -59,7 +59,6 @@ import { cwd } from 'vs/base/common/process';
import { IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol';
import { ProtocolMainService } from 'vs/platform/protocol/electron-main/protocolMainService';
import { Promises } from 'vs/base/common/async';
import { toDisposable } from 'vs/base/common/lifecycle';
/**
* The main VS Code entry point.
@ -340,8 +339,7 @@ class CodeMain {
throw new ExpectedError('Sent env to running instance. Terminating...');
}
const lockFile = await this.createLockfile(environmentMainService);
once(lifecycleMainService.onWillShutdown)(() => lockFile.dispose());
this.createLockfile(logService, lifecycleMainService, environmentMainService);
// Print --status usage info
if (environmentMainService.args.status) {
@ -423,10 +421,13 @@ class CodeMain {
lifecycleMainService.kill(exitCode);
}
private async createLockfile(env: IEnvironmentMainService) {
await FSPromises.writeFile(env.mainLockfile, String(process.pid));
private async createLockfile(logService: ILogService, lifecycle: ILifecycleMainService, env: IEnvironmentMainService) {
FSPromises.writeFile(env.mainLockfile, String(process.pid)).catch(err => {
logService.warn(`Error writing main lockfile: ${err.stack}`);
});
return toDisposable(() => {
once(lifecycle.onWillShutdown)(() => {
try {
unlinkSync(env.mainLockfile);
} catch {