Delete cached profiles hash when saving/deleting profiles
This commit is contained in:
1 parent
4c0d33f575
commit
7eed5cd4d0
1 file changed
+14
-29
+14
-29
@@ -1,10 +1,8 @@
|
|||||||
config = require './config'
|
config = require './config'
|
||||||
util = require 'util'
|
util = require 'util'
|
||||||
http = require 'http'
|
http = require 'http'
|
||||||
mongo = require 'mongodb'
|
url = require 'url'
|
||||||
url = require 'url'
|
db = require './db'
|
||||||
Timestamp = require('mongodb').Timestamp
|
|
||||||
|
|
||||||
|
|
||||||
# regular expression objects
|
# regular expression objects
|
||||||
TASKS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_]+)\/tasks\/?$/
|
TASKS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_]+)\/tasks\/?$/
|
||||||
@@ -12,7 +10,7 @@ TAGS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_]+)\/tags\/([a-zA-Z0-9\-\_]+)\/?$/
|
|||||||
PROFILES_REGEX = /^\/profiles\/([a-zA-Z0-9\-\_]+)\/?$/
|
PROFILES_REGEX = /^\/profiles\/([a-zA-Z0-9\-\_]+)\/?$/
|
||||||
|
|
||||||
connectionRequest = (deviceId, callback) ->
|
connectionRequest = (deviceId, callback) ->
|
||||||
devicesCollection.findOne({_id : deviceId}, {'InternetGatewayDevice.ManagementServer.ConnectionRequestURL._value' : 1}, (err, device)->
|
db.devicesCollection.findOne({_id : deviceId}, {'InternetGatewayDevice.ManagementServer.ConnectionRequestURL._value' : 1}, (err, device)->
|
||||||
if err
|
if err
|
||||||
callback(err)
|
callback(err)
|
||||||
return
|
return
|
||||||
@@ -43,7 +41,7 @@ connectionRequest = (deviceId, callback) ->
|
|||||||
|
|
||||||
watchTask = (taskId, timeout, callback) ->
|
watchTask = (taskId, timeout, callback) ->
|
||||||
setTimeout( () ->
|
setTimeout( () ->
|
||||||
tasksCollection.findOne({_id : taskId}, {'_id' : 1}, (err, task) ->
|
db.tasksCollection.findOne({_id : taskId}, {'_id' : 1}, (err, task) ->
|
||||||
if task
|
if task
|
||||||
timeout -= 500
|
timeout -= 500
|
||||||
if timeout < 0
|
if timeout < 0
|
||||||
@@ -56,23 +54,6 @@ watchTask = (taskId, timeout, callback) ->
|
|||||||
, 500)
|
, 500)
|
||||||
|
|
||||||
|
|
||||||
# Create MongoDB connections
|
|
||||||
dbserver = new mongo.Server(config.MONGODB_SOCKET, 0, {auto_reconnect: true, safe: true})
|
|
||||||
tasksCollection = null
|
|
||||||
devicesCollection = null
|
|
||||||
db = new mongo.Db(config.DATABASE_NAME, dbserver, {native_parser:true, safe:true})
|
|
||||||
db.open( (err, db) ->
|
|
||||||
db.collection('tasks', (err, collection) ->
|
|
||||||
tasksCollection = collection
|
|
||||||
tasksCollection.ensureIndex({device: 1, timestamp: 1}, (err) ->
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
db.collection('devices', (err, collection) ->
|
|
||||||
devicesCollection = collection
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
cluster = require 'cluster'
|
cluster = require 'cluster'
|
||||||
numCPUs = require('os').cpus().length
|
numCPUs = require('os').cpus().length
|
||||||
|
|
||||||
@@ -112,7 +93,9 @@ else
|
|||||||
profile = JSON.parse(body)
|
profile = JSON.parse(body)
|
||||||
profile._id = profileName
|
profile._id = profileName
|
||||||
|
|
||||||
profilesCollection.save(profile, (err) ->
|
db.profilesCollection.save(profile, (err) ->
|
||||||
|
db.memcached.del('profiles_hash', (err, res) ->
|
||||||
|
)
|
||||||
if err
|
if err
|
||||||
response.writeHead(500)
|
response.writeHead(500)
|
||||||
response.end(err)
|
response.end(err)
|
||||||
@@ -121,7 +104,9 @@ else
|
|||||||
response.end()
|
response.end()
|
||||||
)
|
)
|
||||||
else if request.method == 'DELETE'
|
else if request.method == 'DELETE'
|
||||||
profilesCollection.remove({'_id' : profileName}, (err, removedCount) ->
|
db.profilesCollection.remove({'_id' : profileName}, (err, removedCount) ->
|
||||||
|
db.memcached.del('profiles_hash', (err, res) ->
|
||||||
|
)
|
||||||
if err
|
if err
|
||||||
response.writeHead(500)
|
response.writeHead(500)
|
||||||
response.end(err)
|
response.end(err)
|
||||||
@@ -137,7 +122,7 @@ else
|
|||||||
deviceId = r[1]
|
deviceId = r[1]
|
||||||
tag = r[2]
|
tag = r[2]
|
||||||
if request.method == 'POST'
|
if request.method == 'POST'
|
||||||
devicesCollection.update({'_id' : deviceId}, {'$addToSet' : {'_tags' : tag}}, {safe: true}, (err) ->
|
db.devicesCollection.update({'_id' : deviceId}, {'$addToSet' : {'_tags' : tag}}, {safe: true}, (err) ->
|
||||||
if err
|
if err
|
||||||
response.writeHead(500)
|
response.writeHead(500)
|
||||||
response.end(err)
|
response.end(err)
|
||||||
@@ -146,7 +131,7 @@ else
|
|||||||
response.end()
|
response.end()
|
||||||
)
|
)
|
||||||
else if request.method == 'DELETE'
|
else if request.method == 'DELETE'
|
||||||
devicesCollection.update({'_id' : deviceId}, {'$pull' : {'_tags' : tag}}, {safe: true}, (err) ->
|
db.devicesCollection.update({'_id' : deviceId}, {'$pull' : {'_tags' : tag}}, {safe: true}, (err) ->
|
||||||
if err
|
if err
|
||||||
response.writeHead(500)
|
response.writeHead(500)
|
||||||
response.end(err)
|
response.end(err)
|
||||||
@@ -164,9 +149,9 @@ else
|
|||||||
# queue given task
|
# queue given task
|
||||||
task = JSON.parse(body)
|
task = JSON.parse(body)
|
||||||
task.device = deviceId
|
task.device = deviceId
|
||||||
task.timestamp = Timestamp()
|
task.timestamp = db.mongo.Timestamp()
|
||||||
|
|
||||||
tasksCollection.save(task, (err) ->
|
db.tasksCollection.save(task, (err) ->
|
||||||
if err
|
if err
|
||||||
response.writeHead(500)
|
response.writeHead(500)
|
||||||
response.end(err)
|
response.end(err)
|
||||||
|
|||||||
Reference in new issue
Block a user