Fix microsoft#89559

sandy081 · sandy081 · commit fd8411e75e69 · 2020-11-02T16:27:36.000+01:00
diff --git a/scripts/code.bat b/scripts/code.bat
@@ -22,7 +22,6 @@ set VSCODE_DEV=1
 set VSCODE_CLI=1
 set ELECTRON_ENABLE_LOGGING=1
 set ELECTRON_ENABLE_STACK_DUMPING=1
-set VSCODE_LOGS=
 
 :: Launch Code
 
diff --git a/scripts/code.sh b/scripts/code.sh
@@ -41,7 +41,6 @@ function code() {
 	export VSCODE_CLI=1
 	export ELECTRON_ENABLE_STACK_DUMPING=1
 	export ELECTRON_ENABLE_LOGGING=1
-	export VSCODE_LOGS=
 
 	# Launch Code
 	exec "$CODE" . --no-sandbox "$@"
diff --git a/src/vs/base/test/common/processes.test.ts b/src/vs/base/test/common/processes.test.ts
@@ -19,7 +19,6 @@ suite('Processes', () => {
 			VSCODE_CLI: 'x',
 			VSCODE_DEV: 'x',
 			VSCODE_IPC_HOOK: 'x',
-			VSCODE_LOGS: 'x',
 			VSCODE_NLS_CONFIG: 'x',
 			VSCODE_PORTABLE: 'x',
 			VSCODE_PID: 'x',
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
@@ -200,7 +200,7 @@ class CodeMain {
 			VSCODE_IPC_HOOK: environmentService.mainIPCHandle
 		};
 
-		['VSCODE_NLS_CONFIG', 'VSCODE_LOGS', 'VSCODE_PORTABLE'].forEach(key => {
+		['VSCODE_NLS_CONFIG', 'VSCODE_PORTABLE'].forEach(key => {
 			const value = process.env[key];
 			if (typeof value === 'string') {
 				instanceEnvironment[key] = value;
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
@@ -78,6 +78,7 @@ export interface NativeParsedArgs {
 	'force-user-env'?: boolean;
 	'sync'?: 'on' | 'off';
 	'__sandbox'?: boolean;
+	'logsPath'?: string;
 
 	// chromium command line args: https://electronjs.org/docs/all#supported-chrome-command-line-switches
 	'no-proxy-server'?: boolean;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
@@ -112,6 +112,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'force-user-env': { type: 'boolean' },
 	'open-devtools': { type: 'boolean' },
 	'__sandbox': { type: 'boolean' },
+	'logsPath': { type: 'string' },
 
 	// chromium flags
 	'no-proxy-server': { type: 'boolean' },
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
@@ -204,12 +204,11 @@ export class NativeEnvironmentService implements INativeEnvironmentService {
 	get disableTelemetry(): boolean { return !!this._args['disable-telemetry']; }
 
 	constructor(protected _args: NativeParsedArgs) {
-		if (!process.env['VSCODE_LOGS']) {
+		if (!_args.logsPath) {
 			const key = toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '');
-			process.env['VSCODE_LOGS'] = path.join(this.userDataPath, 'logs', key);
+			_args.logsPath = path.join(this.userDataPath, 'logs', key);
 		}
-
-		this.logsPath = process.env['VSCODE_LOGS']!;
+		this.logsPath = _args.logsPath;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -204,12 +204,11 @@ export class NativeEnvironmentService implements INativeEnvironmentService {`
`204`	`204`	`get disableTelemetry(): boolean { return !!this._args['disable-telemetry']; }`
`205`	`205`
`206`	`206`	`constructor(protected _args: NativeParsedArgs) {`
`207`		`- if (!process.env['VSCODE_LOGS']) {`
	`207`	`+ if (!_args.logsPath) {`
`208`	`208`	`const key = toLocalISOString(new Date()).replace(/-\|:\|\.\d+Z$/g, '');`
`209`		`- process.env['VSCODE_LOGS'] = path.join(this.userDataPath, 'logs', key);`
	`209`	`+ _args.logsPath = path.join(this.userDataPath, 'logs', key);`
`210`	`210`	`}`
`211`		`-`
`212`		`- this.logsPath = process.env['VSCODE_LOGS']!;`
	`211`	`+ this.logsPath = _args.logsPath;`
`213`	`212`	`}`
`214`	`213`	`}`
`215`	`214`