Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

git: cleanup ipc handles on deactivate

Browse Source 
related to #7758
This commit is contained in:
Joao Moreno
2018-05-03 09:12:05 +02:00
parent 11073cedd3
commit ee582714b6
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/git/src/askpass.ts
View File

@@ -10,6 +10,7 @@ import { denodeify } from './util';
import * as path from 'path'; import * as path from 'path';
import * as http from 'http'; import * as http from 'http';
import * as os from 'os'; import * as os from 'os';
import * as fs from 'fs';
import * as crypto from 'crypto'; import * as crypto from 'crypto';
const randomBytes = denodeify<Buffer>(crypto.randomBytes); const randomBytes = denodeify<Buffer>(crypto.randomBytes);
@@ -38,6 +39,7 @@ export class Askpass implements Disposable {
private server: http.Server; private server: http.Server;
private ipcHandlePathPromise: Promise<string>; private ipcHandlePathPromise: Promise<string>;
private ipcHandlePath: string | undefined;
private enabled = true; private enabled = true;
constructor() { constructor() {
@@ -52,6 +54,7 @@ export class Askpass implements Disposable {
const buffer = await randomBytes(20); const buffer = await randomBytes(20);
const nonce = buffer.toString('hex'); const nonce = buffer.toString('hex');
const ipcHandlePath = getIPCHandlePath(nonce); const ipcHandlePath = getIPCHandlePath(nonce);
this.ipcHandlePath = ipcHandlePath;
try { try {
this.server.listen(ipcHandlePath); this.server.listen(ipcHandlePath);
@@ -110,5 +113,9 @@ export class Askpass implements Disposable {
dispose(): void { dispose(): void {
this.server.close(); this.server.close();
if (this.ipcHandlePath && process.platform !== 'win32') {
fs.unlinkSync(this.ipcHandlePath);
}
} }
} }

2
extensions/git/src/main.ts
View File

@@ -25,6 +25,8 @@ async function init(context: ExtensionContext, outputChannel: OutputChannel, dis
const pathHint = workspace.getConfiguration('git').get<string>('path'); const pathHint = workspace.getConfiguration('git').get<string>('path');
const info = await findGit(pathHint, path => outputChannel.appendLine(localize('looking', "Looking for git in: {0}", path))); const info = await findGit(pathHint, path => outputChannel.appendLine(localize('looking', "Looking for git in: {0}", path)));
const askpass = new Askpass(); const askpass = new Askpass();
disposables.push(askpass);
const env = await askpass.getEnv(); const env = await askpass.getEnv();
const git = new Git({ gitPath: info.path, version: info.version, env }); const git = new Git({ gitPath: info.path, version: info.version, env });
const model = new Model(git, context.globalState, outputChannel); const model = new Model(git, context.globalState, outputChannel);