Explorar o código

fix expired projects command

Henry Oswald %!s(int64=8) %!d(string=hai) anos
pai
achega
cd5bcdd7ca

+ 1 - 1
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)

+ 6 - 2
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)
 
 

+ 2 - 0
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()

+ 1 - 1
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"
 

+ 1 - 1
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"