Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 23:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

read total from global object

Browse Source
This commit is contained in:
barisusakli
2014-10-13 15:06:21 -04:00
parent be0d043b2b
commit fced152e41
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/controllers/admin.js
View File

@@ -70,16 +70,16 @@ adminController.home = function(req, res, next) {
function getStats(callback) { function getStats(callback) {
async.parallel([ async.parallel([
function(next) { function(next) {
getStatsForSet('ip:recent', next); getStatsForSet('ip:recent', 'uniqueIPCount', next);
}, },
function(next) { function(next) {
getStatsForSet('users:joindate', next); getStatsForSet('users:joindate', 'userCount', next);
}, },
function(next) { function(next) {
getStatsForSet('posts:pid', next); getStatsForSet('posts:pid', 'postCount', next);
}, },
function(next) { function(next) {
getStatsForSet('topics:tid', next); getStatsForSet('topics:tid', 'topicCount', next);
} }
], function(err, results) { ], function(err, results) {
if (err) { if (err) {
@@ -94,12 +94,13 @@ function getStats(callback) {
}); });
} }
function getStatsForSet(set, callback) { function getStatsForSet(set, field, callback) {
var terms = { var terms = {
day: 86400000, day: 86400000,
week: 604800000, week: 604800000,
month: 2592000000 month: 2592000000
}; };
var now = Date.now(); var now = Date.now();
async.parallel({ async.parallel({
day: function(next) { day: function(next) {
@@ -112,7 +113,7 @@ function getStatsForSet(set, callback) {
db.sortedSetCount(set, now - terms.month, now, next); db.sortedSetCount(set, now - terms.month, now, next);
}, },
alltime: function(next) { alltime: function(next) {
db.sortedSetCount(set, 0, now, next); db.getObjectField('global', field, next);
} }
}, callback); }, callback);
} }

4
src/middleware/middleware.js
View File

@@ -51,7 +51,9 @@ middleware.updateLastOnlineTime = function(req, res, next) {
} }
var today = new Date(); var today = new Date();
today.setHours(today.getHours(), 0, 0, 0); today.setHours(today.getHours(), 0, 0, 0);
if (!score) {
db.incrObjectField('global', 'uniqueIPCount');
}
if (!score || score < today.getTime()) { if (!score || score < today.getTime()) {
db.sortedSetIncrBy('analytics:uniquevisitors', 1, today.getTime()); db.sortedSetIncrBy('analytics:uniquevisitors', 1, today.getTime());
db.sortedSetAdd('ip:recent', Date.now(), req.ip || 'Unknown'); db.sortedSetAdd('ip:recent', Date.now(), req.ip || 'Unknown');