Added options to expire tasks and prevent duplicates.

This commit is contained in:
Zaid Abdulla committed 2013-03-22 00:53:40 +03:00
1 parent de2edd0438
commit cc68d3b62e
3 files changed
+29 -25

No files matched your search

+10
View File
@@ -136,6 +136,12 @@ runTask = (currentRequest, task, methodResponse) ->
)
isTaskExpired = (task) ->
now = Date.now()
if task.expires and (now - task.timestamp.getTime()) > config.DEVICE_ONLINE_THRESHOLD
return true
return false
nextTask = (currentRequest) ->
cur = db.tasksCollection.find({'device' : currentRequest.deviceId}).sort(['timestamp']).limit(1)
cur.nextObject( (err, task) ->
@@ -171,6 +177,10 @@ nextTask = (currentRequest) ->
# last task was faulty. Do nothing until until task is deleted
res = tr069.response(null, cwmpResponse)
writeResponse(currentRequest, res)
else if isTaskExpired(task)
db.tasksCollection.remove({'_id' : mongodb.ObjectID(String(task._id))}, {safe: true}, (err, removed) ->
nextTask(currentRequest)
)
else
util.log("#{currentRequest.deviceId}: Started task #{task.name}(#{task._id})")
runTask(currentRequest, task, {})