From 3d18c4015a64d636305fc488168186eecc0b3bb1 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 3 Dec 2013 17:43:12 -0500 Subject: [PATCH] cleanup --- src/database/mongo.js | 3 +-- src/database/redis.js | 4 ++++ src/plugins.js | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/database/mongo.js b/src/database/mongo.js index a202a63cea..d72fbc8e9f 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -109,7 +109,7 @@ } callback(null, data[field]); - }) + }); } module.getObjectFields = function(key, fields, callback) { @@ -179,7 +179,6 @@ var data = {}; data[field] = value; db.collection('objects').update({_key:key}, {$inc : data}, function(err, result) { - console.log('incrObjectFieldBy', err, result); module.getObjectField(key, field, function(err, value) { callback(err, value); }); diff --git a/src/database/redis.js b/src/database/redis.js index 4dc45ae6eb..6a673de6a6 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -136,6 +136,10 @@ redisClient.get(key, callback); } + module.keys = function(key, callback) { + redisClient.keys(keym callback); + } + //hashes module.setObject = function(key, data, callback) { diff --git a/src/plugins.js b/src/plugins.js index 0ba6eae81d..ea0e459980 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -153,13 +153,19 @@ var fs = require('fs'), })); next(); - } else next(); + } else { + next(); + } } ], function(err) { if (!err) { - if (global.env === 'development') winston.info('[plugins] Loaded plugin: ' + pluginData.id); + if (global.env === 'development') { + winston.info('[plugins] Loaded plugin: ' + pluginData.id); + } callback(); - } else callback(new Error('Could not load plugin system')) + } else { + callback(new Error('Could not load plugin system')); + } }); }); }; @@ -212,7 +218,9 @@ var fs = require('fs'), next(null, value); } } else { - if (global.env === 'development') winston.info('[plugins] Expected method \'' + hookObj.method + '\' in plugin \'' + hookObj.id + '\' not found, skipping.'); + if (global.env === 'development') { + winston.info('[plugins] Expected method \'' + hookObj.method + '\' in plugin \'' + hookObj.id + '\' not found, skipping.'); + } next(null, value); } }, function(err, value) { @@ -222,7 +230,7 @@ var fs = require('fs'), } } - callback.apply(plugins, arguments); + callback.apply(Plugins, arguments); }); break; case 'action':