github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Decaf cleanup: convert async function to sync

Browse source 
The examineOldContainer() function doesn't need to use callbacks since
it only does synchronous work.
This commit is contained in:
Eric Mc Sween 2020-09-03 15:05:13 -04:00
parent 2584586ba2
commit 44bf38d6db
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
services/clsi/app/js/DockerRunner.js
View file

@ -1,5 +1,4 @@
/* eslint-disable
handle-callback-err,
no-return-assign,
no-unused-vars,
*/
@ -574,7 +573,7 @@ module.exports = DockerRunner = {
{ containerName: name, created, now, age, maxAge, ttl },
'checking whether to destroy container'
)
callback(null, name, container.Id, ttl)
return { name, id: container.Id, ttl }
},
destroyOldContainers(callback) {
@ -584,21 +583,15 @@ module.exports = DockerRunner = {
}
const jobs = []
for (const container of containers) {
DockerRunner.examineOldContainer(container, function (
err,
name,
id,
ttl
) {
if (name.slice(0, 9) === '/project-' && ttl <= 0) {
// strip the / prefix
// the LockManager uses the plain container name
name = name.slice(1)
jobs.push((cb) =>
DockerRunner.destroyContainer(name, id, false, () => cb())
)
}
})
const { name, id, ttl } = DockerRunner.examineOldContainer(container)
if (name.slice(0, 9) === '/project-' && ttl <= 0) {
// strip the / prefix
// the LockManager uses the plain container name
const plainName = name.slice(1)
jobs.push((cb) =>
DockerRunner.destroyContainer(plainName, id, false, () => cb())
)
}
}
// Ignore errors because some containers get stuck but
// will be destroyed next time