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

Prevent race condition setting up many containers

Browse source
This commit is contained in:
1computer1 2019-05-21 11:59:54 -04:00
parent 030f24be24
commit b7a76fe087
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/struct/LanguageHandler.js
View file

@ -79,7 +79,7 @@ class LanguageHandler extends AkairoHandler {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log(`Built image 1computer1/comp_iler:${dockerID}.`); console.log(`Built image 1computer1/comp_iler:${dockerID}.`);
const concurrent = this.getCompilerConfig(dockerID, 'concurrent', 'number'); const concurrent = this.getCompilerConfig(dockerID, 'concurrent', 'number');
this.queues.set(dockerID, new Queue(concurrent)); this.queues.set(dockerID, { evalQueue: new Queue(concurrent), setupQueue: new Queue(1) });
if (this.client.config.prepare) { if (this.client.config.prepare) {
await this.setupContainer(dockerID); await this.setupContainer(dockerID);
} }
@ -113,9 +113,9 @@ class LanguageHandler extends AkairoHandler {
evalCode({ language, code, options, retries = 0 }) { evalCode({ language, code, options, retries = 0 }) {
const { id: dockerID = language.id, env = {} } = language.runWith(options); const { id: dockerID = language.id, env = {} } = language.runWith(options);
const queue = this.queues.get(dockerID); const { evalQueue, setupQueue } = this.queues.get(dockerID);
return queue.enqueue(async () => { return evalQueue.enqueue(async () => {
const { name } = await this.setupContainer(dockerID); const { name } = await setupQueue.enqueue(() => this.setupContainer(dockerID));
const proc = childProcess.spawn('docker', [ const proc = childProcess.spawn('docker', [
'exec', 'exec',
`-eCODEDIR=${Date.now()}`, `-eCODEDIR=${Date.now()}`,