From 636551d2e939f2fb98ca159313a942b8e6692f49 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Mon, 2 Dec 2013 16:35:32 -0500 Subject: [PATCH] plugins.js uses db, added some set methods to redis.js --- src/database/redis.js | 15 +++++++++++++++ src/plugins.js | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/database/redis.js b/src/database/redis.js index a52ad7ec1c..827491966f 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -116,6 +116,21 @@ } + module.setAdd = function(key, value, callback) { + redisClient.sadd(key, value, callback); + } + + module.setRemove = function(key, value, callback) { + redisClient.srem(key, value, callback); + } + + module.isSetMember = function(key, value, callback) { + redisClient.sismember(key, value, callback); + } + + module.getSetMembers = function(key, callback) { + redisClient.smembers(key, callback); + } diff --git a/src/plugins.js b/src/plugins.js index 9a7142366e..7dbc0a6bdd 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -46,7 +46,7 @@ var fs = require('fs'), // Read the list of activated plugins and require their libraries async.waterfall([ function(next) { - RDB.smembers('plugins:active', next); + db.getSetMembers('plugins:active', next); }, function(plugins, next) { if (plugins && Array.isArray(plugins) && plugins.length > 0) { @@ -230,7 +230,7 @@ var fs = require('fs'), } }, isActive: function(id, callback) { - RDB.sismember('plugins:active', id, callback); + db.isSetMember('plugins:active', id, callback); }, toggleActive: function(id, callback) { this.isActive(id, function(err, active) { @@ -239,7 +239,7 @@ var fs = require('fs'), return; } - RDB[(active ? 'srem' : 'sadd')]('plugins:active', id, function(err, success) { + db[(active ? 'setRemove' : 'setAdd')]('plugins:active', id, function(err, success) { if (err) { if (global.env === 'development') winston.info('[plugins] Could not toggle active state on plugin \'' + id + '\''); return;