Merge remote-tracking branch 'origin/master' into socket.io1.x

This commit is contained in:
barisusakli
2014-11-24 13:29:23 -05:00
15 changed files with 190 additions and 41 deletions

View File

@@ -32,7 +32,8 @@ var async = require('async'),
config: {},
settings: {},
email: {},
analytics: {}
analytics: {},
logs: {}
};
SocketAdmin.before = function(socket, method, next) {
@@ -207,6 +208,14 @@ SocketAdmin.analytics.get = function(socket, data, callback) {
}
};
SocketAdmin.logs.get = function(socket, data, callback) {
meta.logs.get(callback);
};
SocketAdmin.logs.clear = function(socket, data, callback) {
meta.logs.clear(callback);
};
function getHourlyStatsForSet(set, hours, callback) {
var hour = new Date(),
terms = {},