diff --git a/src/database/level/hash.js b/src/database/level/hash.js index c321fc9dae..b35a1b1193 100644 --- a/src/database/level/hash.js +++ b/src/database/level/hash.js @@ -18,7 +18,7 @@ module.exports = function(db, module) { } ], function(err) { if (typeof callback === 'function') { - callback(err, obj); + callback(err); } }); }; @@ -42,7 +42,7 @@ module.exports = function(db, module) { if (typeof callback === 'function') { callback(err, obj); } - }); + }); } else { if (typeof callback === 'function') { callback(err, {}); diff --git a/src/database/level/list.js b/src/database/level/list.js index 28a899f001..ca579178f0 100644 --- a/src/database/level/list.js +++ b/src/database/level/list.js @@ -2,7 +2,7 @@ module.exports = function(db, module) { var helpers = module.helpers.level; - + module.listPrepend = function(key, value, callback) { module.getListRange(key, 0, -1, function(err, list) { var arr = list || []; @@ -17,7 +17,7 @@ module.exports = function(db, module) { arr.push(value); module.set(key, arr, function(err) { if (typeof callback === 'function') { - callback(err, list); + callback(err); } }); }); diff --git a/src/database/level/sets.js b/src/database/level/sets.js index 5d6ffabf6c..df10f4a632 100644 --- a/src/database/level/sets.js +++ b/src/database/level/sets.js @@ -6,13 +6,15 @@ module.exports = function(db, module) { var helpers = module.helpers.level; module.setAdd = function(key, value, callback) { + callback = callback || function() {}; module.getListRange(key, 0, -1, function(err, set) { + if (err) { + return callback(err); + } if (set.indexOf(value) === -1) { module.listAppend(key, value, callback); } else { - if (typeof callback === 'function') { - callback(null, []); // verify if it sends back true on redis? - } + callback(null); } }); }; diff --git a/src/database/mongo.js b/src/database/mongo.js index affb658dba..9976d323ab 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -38,6 +38,9 @@ } ]; + module.helpers = module.helpers || {}; + module.helpers.mongo = require('./mongo/helpers'); + module.init = function(callback) { try { mongoClient = require('mongodb').MongoClient; @@ -116,7 +119,5 @@ db.close(); }; - module.helpers = module.helpers || {}; - module.helpers.mongo = require('./mongo/helpers'); }(exports)); diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index 92db4662b6..78b2e9a61c 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -6,7 +6,9 @@ module.exports = function(db, module) { module.setObject = function(key, data, callback) { callback = callback || helpers.noop; data._key = key; - db.collection('objects').update({_key:key}, {$set:data}, {upsert:true, w: 1}, callback); + db.collection('objects').update({_key:key}, {$set:data}, {upsert:true, w: 1}, function(err) { + callback(err); + }); }; module.setObjectField = function(key, field, value, callback) { diff --git a/src/database/mongo/sets.js b/src/database/mongo/sets.js index 264a950165..e7d606092a 100644 --- a/src/database/mongo/sets.js +++ b/src/database/mongo/sets.js @@ -24,7 +24,9 @@ module.exports = function(db, module) { }, { upsert: true, w: 1 - }, callback); + }, function(err) { + callback(err); + }); }; module.setRemove = function(key, value, callback) { diff --git a/src/database/redis/hash.js b/src/database/redis/hash.js index 63a85f77ec..b4fb033348 100644 --- a/src/database/redis/hash.js +++ b/src/database/redis/hash.js @@ -3,7 +3,9 @@ module.exports = function(redisClient, module) { module.setObject = function(key, data, callback) { callback = callback || function() {}; - redisClient.hmset(key, data, callback); + redisClient.hmset(key, data, function(err) { + callback(err); + }); }; module.setObjectField = function(key, field, value, callback) { diff --git a/src/database/redis/sets.js b/src/database/redis/sets.js index 88db7ad36a..2ceb2cb252 100644 --- a/src/database/redis/sets.js +++ b/src/database/redis/sets.js @@ -2,7 +2,10 @@ module.exports = function(redisClient, module) { module.setAdd = function(key, value, callback) { - redisClient.sadd(key, value, callback); + callback = callback || function() {}; + redisClient.sadd(key, value, function(err) { + callback(err); + }); }; module.setRemove = function(key, value, callback) { diff --git a/src/posts.js b/src/posts.js index 57a97e71ca..c70002f4d0 100644 --- a/src/posts.js +++ b/src/posts.js @@ -69,7 +69,7 @@ var async = require('async'), function(postData, next) { db.setObject('post:' + postData.pid, postData, next); }, - function(result, next) { + function(next) { db.sortedSetAdd('posts:pid', timestamp, postData.pid); db.incrObjectField('global', 'postCount'); diff --git a/src/topics/create.js b/src/topics/create.js index 2feb2ae787..7d35e9ba92 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -210,7 +210,7 @@ module.exports = function(Topics) { function(next) { Topics.markAsRead(tid, uid, next); }, - function(result, next) { + function(next) { posts.getUserInfoForPosts([postData.uid], next); }, function(userInfo, next) {