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

moved getMonthlyPageViews to analytics

Browse Source
This commit is contained in:
barisusakli
2015-08-13 12:20:53 -04:00
parent 235a981dd1
commit aeb15ed7ee
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/analytics.js
View File

@@ -66,4 +66,23 @@ var cronJob = require('cron').CronJob,
Analytics.getUnwrittenPageviews = function() { Analytics.getUnwrittenPageviews = function() {
return pageViews; return pageViews;
}; };
Analytics.getMonthlyPageViews = function(callback) {
var thisMonth = new Date();
var lastMonth = new Date();
thisMonth.setMonth(thisMonth.getMonth(), 1);
thisMonth.setHours(0, 0, 0, 0);
lastMonth.setMonth(thisMonth.getMonth() - 1, 1);
lastMonth.setHours(0, 0, 0, 0);
var values = [thisMonth.getTime(), lastMonth.getTime()];
db.sortedSetScores('analytics:pageviews:month', values, function(err, scores) {
if (err) {
return callback(err);
}
callback(null, {thisMonth: scores[0] || 0, lastMonth: scores[1] || 0});
});
};
}(exports)); }(exports));

20
src/socket.io/admin.js
View File

@@ -233,7 +233,7 @@ SocketAdmin.analytics.get = function(socket, data, callback) {
getHourlyStatsForSet('analytics:pageviews', data.amount, next); getHourlyStatsForSet('analytics:pageviews', data.amount, next);
}, },
monthlyPageViews: function(next) { monthlyPageViews: function(next) {
getMonthlyPageViews(next); analytics.getMonthlyPageViews(next);
} }
}, function(err, data) { }, function(err, data) {
data.pastDay = data.pageviews.reduce(function(a, b) {return parseInt(a, 10) + parseInt(b, 10);}); data.pastDay = data.pageviews.reduce(function(a, b) {return parseInt(a, 10) + parseInt(b, 10);});
@@ -286,24 +286,6 @@ function getHourlyStatsForSet(set, hours, callback) {
}); });
} }
function getMonthlyPageViews(callback) {
var thisMonth = new Date();
var lastMonth = new Date();
thisMonth.setMonth(thisMonth.getMonth(), 1);
thisMonth.setHours(0, 0, 0, 0);
lastMonth.setMonth(thisMonth.getMonth() - 1, 1);
lastMonth.setHours(0, 0, 0, 0);
var values = [thisMonth.getTime(), lastMonth.getTime()];
db.sortedSetScores('analytics:pageviews:month', values, function(err, scores) {
if (err) {
return callback(err);
}
callback(null, {thisMonth: scores[0] || 0, lastMonth: scores[1] || 0});
});
}
SocketAdmin.getMoreEvents = function(socket, next, callback) { SocketAdmin.getMoreEvents = function(socket, next, callback) {
var start = parseInt(next, 10); var start = parseInt(next, 10);
if (start < 0) { if (start < 0) {