faster notif prune

v1.18.x
barisusakli 11 years ago
parent f39d772a40
commit 7d179b68df

@ -285,11 +285,21 @@ var async = require('async'),
return winston.error(err.message); return winston.error(err.message);
} }
async.filter(nids, function(nid, next) { var keys = nids.map(function(nid) {
db.getObjectField('notifications:' + nid, 'datetime', function(err, datetime) { return 'notifications:' + nid;
next(!err && parseInt(datetime, 10) < cutoffTime); });
db.getObjectsFields(keys, ['nid', 'datetime'], function(err, notifs) {
if (err) {
return winston.error(err.message);
}
var expiredNids = notifs.filter(function(notif) {
return notif && parseInt(notif.datetime, 10) < cutoffTime;
}).map(function(notif) {
return notif.nid;
}); });
}, function(expiredNids) {
async.each(expiredNids, function(nid, next) { async.each(expiredNids, function(nid, next) {
async.parallel([ async.parallel([
function(next) { function(next) {
@ -303,15 +313,15 @@ var async = require('async'),
next(err); next(err);
}); });
}, function(err) { }, function(err) {
if (!err) { if (err) {
if (process.env.NODE_ENV === 'development') { return winston.error('Encountered error pruning notifications: ' + err.message);
winston.info('[notifications.prune] Notification pruning completed. ' + numPruned + ' expired notification' + (numPruned !== 1 ? 's' : '') + ' removed.'); }
}
var diff = process.hrtime(start); if (process.env.NODE_ENV === 'development') {
events.log('Pruning notifications took : ' + (diff[0] * 1e3 + diff[1] / 1e6) + ' ms'); winston.info('[notifications.prune] Notification pruning completed. ' + numPruned + ' expired notification' + (numPruned !== 1 ? 's' : '') + ' removed.');
} else {
winston.error('Encountered error pruning notifications: ' + err.message);
} }
var diff = process.hrtime(start);
events.log('Pruning '+ numPruned + 'notifications took : ' + (diff[0] * 1e3 + diff[1] / 1e6) + ' ms');
}); });
}); });
}); });

Loading…
Cancel
Save