Mascali
/
piston
mirror of https://github.com/engineer-man/piston.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

api: read both stdout and stderr

This commit is contained in:
Thomas Hobson 2021-02-21 13:32:35 +13:00
parent f957019710
commit ac46c1b5bb
No known key found for this signature in database
GPG Key ID: 9F1FD9D87950DB6F
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/src/executor/job.js
View File

@ -73,8 +73,9 @@ class Job {
logger.info(`Executing job uuid=${this.uuid} uid=${this.uid} gid=${this.gid} runtime=${this.runtime.toString()}`); logger.info(`Executing job uuid=${this.uuid} uid=${this.uid} gid=${this.gid} runtime=${this.runtime.toString()}`);
logger.debug('Compiling'); logger.debug('Compiling');
const compile = this.runtime.compiled && await new Promise((resolve, reject) => { const compile = this.runtime.compiled && await new Promise((resolve, reject) => {
var stderr, stdout = ''; var stdout = '';
const proc = cp.spawn('bash', [path.join(this.runtime.pkgdir, 'compile'),this.main, ...this.args] ,{ var stderr = '';
const proc = cp.spawn('bash', [path.join(this.runtime.pkgdir, 'compile'),this.main, ...this.files] ,{
env: this.runtime.env_vars, env: this.runtime.env_vars,
stdio: ['pipe', 'pipe', 'pipe'], stdio: ['pipe', 'pipe', 'pipe'],
cwd: this.dir, cwd: this.dir,
@ -92,16 +93,17 @@ class Job {
resolve({stdout, stderr, code, signal}); resolve({stdout, stderr, code, signal});
}); });
proc.on('error', (code, signal) => { proc.on('error', (err) => {
clearTimeout(kill_timeout); clearTimeout(kill_timeout);
reject({stdout, stderr, code, signal}); reject({error: err, stdout, stderr});
}); });
}); });
logger.debug('Running'); logger.debug('Running');
const run = await new Promise((resolve, reject) => { const run = await new Promise((resolve, reject) => {
var stderr, stdout = ''; var stdout = '';
var stderr = '';
const proc = cp.spawn('bash', [path.join(this.runtime.pkgdir, 'run'),this.main, ...this.args] ,{ const proc = cp.spawn('bash', [path.join(this.runtime.pkgdir, 'run'),this.main, ...this.args] ,{
env: this.runtime.env_vars, env: this.runtime.env_vars,
stdio: ['pipe', 'pipe', 'pipe'], stdio: ['pipe', 'pipe', 'pipe'],
@ -120,9 +122,9 @@ class Job {
resolve({stdout, stderr, code, signal}); resolve({stdout, stderr, code, signal});
}); });
proc.on('error', (code, signal) => { proc.on('error', (err) => {
clearTimeout(kill_timeout); clearTimeout(kill_timeout);
reject({stdout, stderr, code, signal}); reject({error: err, stdout, stderr});
}); });
}); });