Skip to content

Handle null exit codes and no stdout. Fixes #1205 #1206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brollb merged 1 commit into from
Mar 9, 2019
Merged

Handle null exit codes and no stdout. Fixes #1205 #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/ExecuteJob/ExecuteJob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ define([
// Download all files
this.result.addArtifact(info.resultHashes[name + '-all-files']);
// Parse the most precise error and present it in the toast...
const lastline = result.stdout.split('\n').filter(l => !!l).pop();
const lastline = result.stdout.split('\n').filter(l => !!l).pop() || '';
if (lastline.includes('Error')) {
this.onOperationFail(op, lastline);
} else {
Expand Down
13 changes: 9 additions & 4 deletions src/plugins/GenerateJob/templates/start.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var COMMAND_PREFIX = '<%= CONSTANTS.START_CMD %>',
IMAGE = '<%= CONSTANTS.IMAGE.PREFIX %>',
requirejs = require('webgme').requirejs,
remainingImageCount = 0,
exitCode = null;
exitCode;

requirejs([
'q',
Expand Down Expand Up @@ -79,7 +79,7 @@ requirejs([
});

var checkFinished = () => {
if (exitCode !== null && remainingImageCount === 0) {
if (exitCode !== undefined && remainingImageCount === 0) {
log('finished!');
cleanup();
}
Expand Down Expand Up @@ -221,8 +221,13 @@ requirejs([
log(`killing process group: ${pid}`);
process.kill(-pid, 'SIGTERM');
}
if (exitCode !== null) {
log(`exiting w/ code ${exitCode}`);
if (exitCode !== undefined) {
if (exitCode !== null) {
log(`exiting w/ code ${exitCode}`);
} else { // exited involuntarily
log(`script exited involuntarily (exit code is null)`);
return process.exit(1);
}
process.exit(exitCode);
}
};
Expand Down