diff --git a/services/clsi/Makefile b/services/clsi/Makefile index 6daee1be7c..b1ce2934af 100644 --- a/services/clsi/Makefile +++ b/services/clsi/Makefile @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.8 +# Version: 1.1.9 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) diff --git a/services/clsi/app/coffee/ProjectPersistenceManager.coffee b/services/clsi/app/coffee/ProjectPersistenceManager.coffee index f41c14cd1d..2c73c614aa 100644 --- a/services/clsi/app/coffee/ProjectPersistenceManager.coffee +++ b/services/clsi/app/coffee/ProjectPersistenceManager.coffee @@ -68,11 +68,15 @@ module.exports = ProjectPersistenceManager = _findExpiredProjectIds: (callback = (error, project_ids) ->) -> job = (cb)-> - console.log("_findExpiredProjectIds") - db.Project.findAll(where: ["lastAccessed < ?", new Date(Date.now() - ProjectPersistenceManager.EXPIRY_TIMEOUT)]) + keepProjectsFrom = new Date(Date.now() - ProjectPersistenceManager.EXPIRY_TIMEOUT) + console.log("_findExpiredProjectIds", keepProjectsFrom) + q = {} + q[db.op.gt] = keepProjectsFrom + db.Project.findAll(where:{lastAccessed:q}) .then((projects) -> cb null, projects.map((project) -> project.project_id) ).error cb + dbQueue.queue.push(job, callback) diff --git a/services/clsi/app/coffee/db.coffee b/services/clsi/app/coffee/db.coffee index 764edebe8e..de48dfdf55 100644 --- a/services/clsi/app/coffee/db.coffee +++ b/services/clsi/app/coffee/db.coffee @@ -41,6 +41,8 @@ module.exports = ] }) + op: Sequelize.Op + sync: () -> logger.log dbPath:Settings.mysql.clsi.storage, "syncing db schema" sequelize.sync() diff --git a/services/clsi/docker-compose.ci.yml b/services/clsi/docker-compose.ci.yml index e8850b9334..f6c8a27fd0 100644 --- a/services/clsi/docker-compose.ci.yml +++ b/services/clsi/docker-compose.ci.yml @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.8 +# Version: 1.1.9 version: "2" diff --git a/services/clsi/docker-compose.yml b/services/clsi/docker-compose.yml index f47658d3f2..371e6e768d 100644 --- a/services/clsi/docker-compose.yml +++ b/services/clsi/docker-compose.yml @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.8 +# Version: 1.1.9 version: "2"