test resolver: prefer connection-token over connection-token-file

This commit is contained in:
Martin Aeschlimann 2022-01-21 17:38:41 +01:00
parent 3aeec48751
commit cc93826815
No known key found for this signature in database
GPG key ID: 2609A01E695523E3

View file

@ -94,12 +94,7 @@ export function activate(context: vscode.ExtensionContext) {
outputChannel.appendLine(`Using data folder at ${remoteDataDir}`);
commandArgs.push('--server-data-dir', remoteDataDir);
const connectionTokenFile = path.join(remoteDataDir, `${process.pid}-${new Date().getTime()}.token`);
if (!fs.existsSync(remoteDataDir)) {
fs.mkdirSync(remoteDataDir, { recursive: true });
}
fs.writeFileSync(connectionTokenFile, connectionToken);
commandArgs.push('--connection-token-file', connectionTokenFile);
commandArgs.push('--connection-token', connectionToken);
if (!commit) { // dev mode
const serverCommand = process.platform === 'win32' ? 'code-server.bat' : 'code-server.sh';
@ -143,11 +138,6 @@ export function activate(context: vscode.ExtensionContext) {
if (extHostProcess) {
terminateProcess(extHostProcess, context.extensionPath);
}
try {
fs.unlinkSync(connectionTokenFile);
} catch (_e) {
//ignore
}
}
});
});