ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Append stdErr log to error message when a streamed console command fails. (#7868)

Browse Source
This commit is contained in:
Cory Rivera
2019-10-23 12:38:24 -07:00
committed by GitHub
parent 41f9f22e38
commit 06d67f5ad2
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/notebook/src/common/utils.ts
View File

@@ -66,20 +66,29 @@ export function executeStreamedCommand(cmd: string, options: childProcess.SpawnO
let child = childProcess.spawn(cmd, [], options); let child = childProcess.spawn(cmd, [], options);
// Add listeners to resolve/reject the promise on exit // Add listeners to resolve/reject the promise on exit
child.on('error', reject); child.on('error', err => {
reject(err);
});
let stdErrLog = '';
child.on('exit', (code: number) => { child.on('exit', (code: number) => {
if (code === 0) { if (code === 0) {
resolve(); resolve();
} else { } else {
reject(localize('executeCommandProcessExited', "Process exited with code {0}", code)); reject(localize('executeCommandProcessExited', 'Process exited with with error code: {0}. StdErr Output: {1}', code, stdErrLog));
} }
}); });
// Add listeners to print stdout and stderr if an output channel was provided // Add listeners to print stdout and stderr if an output channel was provided
if (outputChannel) { if (outputChannel) {
child.stdout.on('data', data => { outputDataChunk(data, outputChannel, ' stdout: '); }); child.stdout.on('data', data => { outputDataChunk(data, outputChannel, ' stdout: '); });
child.stderr.on('data', data => { outputDataChunk(data, outputChannel, ' stderr: '); });
} }
child.stderr.on('data', data => {
if (outputChannel) {
outputDataChunk(data, outputChannel, ' stderr: ');
}
stdErrLog += data.toString();
});
}); });
} }

2
extensions/notebook/src/jupyter/serverInstance.ts
View File

@@ -260,7 +260,7 @@ export class PerFolderServerInstance implements IServerInstance {
let onErrorBeforeStartup = (err: any) => reject(err); let onErrorBeforeStartup = (err: any) => reject(err);
let onExitBeforeStart = (err: any) => { let onExitBeforeStart = (err: any) => {
if (!this.isStarted) { if (!this.isStarted) {
reject(localize('notebookStartProcessExitPremature', "Notebook process exited prematurely with error: {0}, StdErr Output: {1}", err, stdErrLog)); reject(localize('notebookStartProcessExitPremature', 'Notebook process exited prematurely with error code: {0}. StdErr Output: {1}', err, stdErrLog));
} }
}; };
this.childProcess.on('error', onErrorBeforeStartup); this.childProcess.on('error', onErrorBeforeStartup);