moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

StatLog will now store for N days or N max/count items

This commit is contained in:
Bryan Ashby 2016-09-01 23:41:20 -06:00
parent 9d46f23c66
commit 767bddcc4b
3 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
core/stat_log.js
View File

@ -50,6 +50,15 @@ class StatLog {
}; };
} }
get KeepType() {
return {
Forever : 'forever',
Days : 'days',
Max : 'max',
Count : 'max',
};
}
get Order() { get Order() {
return { return {
Timestamp : 'timestamp_asc', Timestamp : 'timestamp_asc',
@ -57,7 +66,7 @@ class StatLog {
TimestampDesc : 'timestamp_desc', TimestampDesc : 'timestamp_desc',
Random : 'random', Random : 'random',
}; };
} }
setNonPeristentSystemStat(statName, statValue) { setNonPeristentSystemStat(statName, statValue) {
this.systemStats[statName] = statValue; this.systemStats[statName] = statValue;
@ -129,33 +138,64 @@ class StatLog {
// the time "now" in the ISO format we use and love :) // the time "now" in the ISO format we use and love :)
get now() { return moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ'); } get now() { return moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ'); }
appendSystemLogEntry(logName, logValue, keepDays, cb) { appendSystemLogEntry(logName, logValue, keep, keepType, cb) {
sysDb.run( sysDb.run(
`INSERT INTO system_event_log (timestamp, log_name, log_value) `INSERT INTO system_event_log (timestamp, log_name, log_value)
VALUES (?, ?, ?);`, VALUES (?, ?, ?);`,
[ this.now, logName, logValue ], [ this.now, logName, logValue ],
() => { () => {
// //
// Handle keepDays // Handle keep
// //
if(-1 === keepDays) { if(-1 === keep) {
if(cb) { if(cb) {
return cb(null); return cb(null);
} }
return; return;
} }
sysDb.run( switch(keepType) {
`DELETE FROM system_event_log // keep # of days
WHERE log_name = ? AND timestamp <= DATETIME("now", "-${keepDays} day");`, case 'days' :
[ logName ], sysDb.run(
err => { `DELETE FROM system_event_log
// cb optional - callers may fire & forget WHERE log_name = ? AND timestamp <= DATETIME("now", "-${keep} day");`,
if(cb) { [ logName ],
return cb(err); err => {
} // cb optional - callers may fire & forget
} if(cb) {
); return cb(err);
}
}
);
break;
case 'count':
case 'max' :
// keep max of N/count
sysDb.run(
`DELETE FROM system_event_log
WHERE id IN(
SELECT id
FROM system_event_log
WHERE log_name = ?
ORDER BY id DESC
LIMIT -1 OFFSET ${keep}
);`,
[ logName ],
err => {
if(cb) {
return cb(err);
}
}
);
break;
case 'forever' :
default :
// nop
break;
}
} }
); );
} }

3
core/user_login.js
View File

@ -73,7 +73,8 @@ function userLogin(client, username, password, cb) {
StatLog.incrementUserStat(user, 'login_count', 1, callback); StatLog.incrementUserStat(user, 'login_count', 1, callback);
}, },
function recordLoginHistory(callback) { function recordLoginHistory(callback) {
StatLog.appendSystemLogEntry('user_login_history', user.userId, 30, callback); const LOGIN_HISTORY_MAX = 200; // history of up to last 200 callers
StatLog.appendSystemLogEntry('user_login_history', user.userId, LOGIN_HISTORY_MAX, StatLog.KeepType.Max, callback);
} }
], ],
function complete(err) { function complete(err) {

2
mods/rumorz.js
View File

@ -52,7 +52,7 @@ exports.getModule = class RumorzModule extends MenuModule {
if(_.isString(formData.value.rumor) && renderStringLength(formData.value.rumor) > 0) { if(_.isString(formData.value.rumor) && renderStringLength(formData.value.rumor) > 0) {
const rumor = formData.value.rumor.trim(); // remove any trailing ws const rumor = formData.value.rumor.trim(); // remove any trailing ws
StatLog.appendSystemLogEntry(STATLOG_KEY_RUMORZ, rumor, StatLog.KeepDays.Forever, () => { StatLog.appendSystemLogEntry(STATLOG_KEY_RUMORZ, rumor, StatLog.KeepDays.Forever, StatLog.KeepType.Forever, () => {
this.clearAddForm(); this.clearAddForm();
return this.displayViewScreen(true, cb); // true=cls return this.displayViewScreen(true, cb); // true=cls
}); });