SunRed/compiler-discord
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Output both stderr and stdout

Browse source
This commit is contained in:
1computer1 2019-06-15 20:08:03 -04:00
parent 6bf880a289
commit bc67dbbfd7
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/listeners/messageInvalid.js
View file

@ -29,13 +29,7 @@ class MessageInvalidListener extends Listener {
let errored = false;
let result;
try {
const { stdout, stderr } = await this.client.languageHandler.evalCode(parse);
if (stderr) {
errored = true;
result = stderr;
} else {
result = stdout;
}
({ output: result, hasStderr: errored } = await this.client.languageHandler.evalCode(parse));
} catch (e) {
errored = true;
result = e.message;

13
src/struct/LanguageHandler.js
View file

@ -155,15 +155,16 @@ class LanguageHandler extends AkairoHandler {
}, timeout);
}
let stdout = '';
let stderr = '';
let output = '';
let hasStderr = false;
let error;
proc.stdout.on('data', chunk => {
stdout += chunk;
output += chunk;
});
proc.stderr.on('data', chunk => {
stderr += chunk;
hasStderr = true;
output += chunk;
});
proc.on('error', e => {
@ -175,12 +176,12 @@ class LanguageHandler extends AkairoHandler {
handled = true;
if (status !== 0 || error) {
if (!error) {
error = new Error(stderr || 'Something went wrong');
error = new Error(output || 'Something went wrong');
}
reject(error);
} else {
resolve({ stdout, stderr });
resolve({ output, hasStderr });
}
}
});