ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change some of the env vars to be ADS-specific (#5636)

Browse Source 
* Change some of the env vars to be ADS-specific

* Undo changes to ext host IPC hook

* Keep VSCODE_LOGS vars too
This commit is contained in:
Charles Gagnon
2019-05-24 17:17:02 -07:00
committed by GitHub
parent c7d94055a4
commit 3bc82c10b1
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mssql/src/utils.ts
View File

@@ -68,7 +68,7 @@ export function getConfigTracingLevel(): string {
} }
export function getDefaultLogDir(): 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 { export function getDefaultLogFile(prefix: string, pid: number): string {

4
src/vs/code/electron-main/main.ts
View File

@@ -251,7 +251,9 @@ function patchEnvironment(environmentService: IEnvironmentService): typeof proce
const instanceEnvironment: typeof process.env = { const instanceEnvironment: typeof process.env = {
VSCODE_IPC_HOOK: environmentService.mainIPCHandle, VSCODE_IPC_HOOK: environmentService.mainIPCHandle,
VSCODE_NLS_CONFIG: process.env['VSCODE_NLS_CONFIG'], 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']) { if (process.env['VSCODE_PORTABLE']) {

8
src/vs/platform/environment/node/environmentService.ts
View File

@@ -266,8 +266,14 @@ export class EnvironmentService implements IEnvironmentService {
const key = toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, ''); const key = toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '');
process.env['VSCODE_LOGS'] = path.join(this.userDataPath, 'logs', key); 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']!;
} }
} }