Handle inavailability of cache gracefully. No longer crashes when memcache is not available.
This commit is contained in:
1 parent
cd67e50062
commit
d739adc32c
3 files changed
+39
-9
No files matched your search
+3
-4
@@ -98,7 +98,7 @@ runTask = (task, reqParams) ->
|
||||
updateDevice(currentRequest.deviceId, actions)
|
||||
|
||||
if Object.keys(resParams).length > 0
|
||||
db.memcached.set(String(task._id), task, config.CACHE_DURATION, (err, result) ->
|
||||
db.updateTask(task, (err) ->
|
||||
res = tr069.response(currentRequest.sessionId, resParams, {task : String(task._id)})
|
||||
writeResponse res
|
||||
)
|
||||
@@ -106,7 +106,7 @@ runTask = (task, reqParams) ->
|
||||
|
||||
# Task finished
|
||||
db.memcached.del(String(task._id))
|
||||
db.tasksCollection.remove({'_id' : db.mongo.ObjectID(task._id)}, {safe: true}, (err, removed) ->
|
||||
db.tasksCollection.remove({'_id' : db.mongo.ObjectID(String(task._id))}, {safe: true}, (err, removed) ->
|
||||
util.log("#{currentRequest.deviceId}: completed task #{task.name}(#{task._id})")
|
||||
cookies = {task : null}
|
||||
nextTask(cookies)
|
||||
@@ -246,8 +246,7 @@ else
|
||||
if not taskId
|
||||
nextTask(cookies)
|
||||
else
|
||||
db.memcached.get(taskId, (err, task) ->
|
||||
# TODO if not found in memcached, fetch from mongo
|
||||
db.getTask(taskId, (task) ->
|
||||
runTask(task, reqParams)
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user