From 3bc82c10b14f8065ee31639fc723361dd0acda2a Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Fri, 24 May 2019 17:17:02 -0700 Subject: [PATCH] Change some of the env vars to be ADS-specific (#5636) * Change some of the env vars to be ADS-specific * Undo changes to ext host IPC hook * Keep VSCODE_LOGS vars too --- extensions/mssql/src/utils.ts | 2 +- src/vs/code/electron-main/main.ts | 4 +++- src/vs/platform/environment/node/environmentService.ts | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/extensions/mssql/src/utils.ts b/extensions/mssql/src/utils.ts index cad77fe5b1..1dc0dd3107 100644 --- a/extensions/mssql/src/utils.ts +++ b/extensions/mssql/src/utils.ts @@ -68,7 +68,7 @@ export function getConfigTracingLevel(): string { } export function getDefaultLogDir(): string { - return path.join(process.env['VSCODE_LOGS'], '..', '..', 'mssql'); + return path.join(process.env['ADS_LOGS'], '..', '..', 'mssql'); } export function getDefaultLogFile(prefix: string, pid: number): string { diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 16a50807ef..111fc412cd 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -251,7 +251,9 @@ function patchEnvironment(environmentService: IEnvironmentService): typeof proce const instanceEnvironment: typeof process.env = { VSCODE_IPC_HOOK: environmentService.mainIPCHandle, VSCODE_NLS_CONFIG: process.env['VSCODE_NLS_CONFIG'], - VSCODE_LOGS: process.env['VSCODE_LOGS'] + VSCODE_LOGS: process.env['VSCODE_LOGS'], + // {{SQL CARBON EDIT}} We keep VSCODE_LOGS to not break functionality for merged code + ADS_LOGS: process.env['ADS_LOGS'] }; if (process.env['VSCODE_PORTABLE']) { diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts index 45ccb6fab5..977cb51bbd 100644 --- a/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts @@ -266,8 +266,14 @@ export class EnvironmentService implements IEnvironmentService { const key = toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, ''); process.env['VSCODE_LOGS'] = path.join(this.userDataPath, 'logs', key); } + // {{SQL CARBON EDIT}} Note we keep the VSCODE_LOGS var above in case merges come in that use that so we don't + // break functionality. ADS code should always use ADS_LOGS when referring to the log path + if (!process.env['ADS_LOGS']) { + const key = toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, ''); + process.env['ADS_LOGS'] = path.join(this.userDataPath, 'logs', key); + } - this.logsPath = process.env['VSCODE_LOGS']!; + this.logsPath = process.env['ADS_LOGS']!; } }