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

api: fix compile stage 

runtime.compiled always returned false as it was undefined.
This made the code think it's a run-only language, and never called the compile script.
This commit is contained in:
Thomas Hobson 2021-02-28 01:18:04 +13:00
parent 7d3777aef8
commit 870a4c1282
No known key found for this signature in database
GPG Key ID: 9F1FD9D87950DB6F
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,10 +131,12 @@ class Job {
if(this.state != job_states.PRIMED) throw new Error('Job must be in primed state, current state: ' + this.state.toString()); if(this.state != job_states.PRIMED) throw new Error('Job must be in primed state, current state: ' + this.state.toString());
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 this.safe_call( var compile = undefined;
path.join(this.runtime.pkgdir, 'compile'), if(this.runtime.compiled)
[this.main, ...this.files], compile = await this.safe_call(
this.timeouts.compile); path.join(this.runtime.pkgdir, 'compile'),
this.files.map(x=>x.name),
this.timeouts.compile);
logger.debug('Running'); logger.debug('Running');

2
api/src/runtime.js
View File

@ -48,7 +48,7 @@ class Runtime {
return res; return res;
} }
get compile(){ get compiled(){
if(this.#compiled === undefined) this.#compiled = fss.exists_sync(path.join(this.pkgdir, 'compile')); if(this.#compiled === undefined) this.#compiled = fss.exists_sync(path.join(this.pkgdir, 'compile'));
return this.#compiled; return this.#compiled;
} }