From 7aafb0b0c45ba7e6688e7662c48303cbba784c02 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 7 Dec 2020 19:52:54 -0700 Subject: [PATCH] Checkpoint --- art/themes/luciano_blocktronics/theme.hjson | 11 +++- core/wfc.js | 63 +++++++++++++-------- 2 files changed, 48 insertions(+), 26 deletions(-) diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson index b533dffc..3054f4e5 100644 --- a/art/themes/luciano_blocktronics/theme.hjson +++ b/art/themes/luciano_blocktronics/theme.hjson @@ -248,7 +248,16 @@ mainMenuWaitingForCaller: { config: { - quickLogLevel: warn + nowDateTimeFormat: "|00|11dddd|08, |11MMMM Do YYYY |08/ |11h|08:|11mm|08:|11ss|03a" + lastLoginDateTimeFormat: "|00|11ddd h|08:|11mm|03a" + + mainInfoFormat10: "|00|11{now} {currentUserName} |08- |03mail|08: " + mainInfoFormat11: "|00|10{callsToday:>5}" + mainInfoFormat12: "|00|10{postsToday:>5}" + + mainInfoFormat19: "|00|10{lastLoginUserName:<19} |02{lastLogin}" + + quickLogLevel: info quickLogLevelIndicators: { trace : |00|02T debug: |00|03D diff --git a/core/wfc.js b/core/wfc.js index 4f8dedb8..4d9c951b 100644 --- a/core/wfc.js +++ b/core/wfc.js @@ -4,6 +4,7 @@ const { MenuModule } = require('./menu_module'); const { getActiveConnectionList } = require('./client_connections'); const StatLog = require('./stat_log'); const SysProps = require('./system_property'); +const UserProps = require('./user_property'); const Log = require('./logger'); const Config = require('./config.js').get; @@ -71,9 +72,9 @@ exports.getModule = class WaitingForCallerModule extends MenuModule { return callback(null); } - const logLevel = this.config.quickLogLevel || - _.get(Config(), 'logging.rotatingFile.level') || - 'info'; + const logLevel = this.config.quickLogLevel || // WFC specific + _.get(Config(), 'logging.rotatingFile.level') || // ...or system setting + 'info'; // ...or default to info this.logRingBuffer = new bunyan.RingBuffer({ limit : quickLogView.dimens.height || 24 }); Log.log.addStream({ @@ -86,10 +87,7 @@ exports.getModule = class WaitingForCallerModule extends MenuModule { return callback(null); }, (callback) => { - return this._refreshStats(callback); - }, - (callback) => { - return this._refreshNodeStatus(callback); + return this._refreshAll(callback); } ], err => { @@ -136,6 +134,14 @@ exports.getModule = class WaitingForCallerModule extends MenuModule { }, (callback) => { return this._refreshQuickLog(callback); + }, + (callback) => { + this.updateCustomViewTextsWithFilter( + 'main', + MciViewIds.main.customRangeStart, + this.stats + ); + return callback(null); } ], err => { @@ -147,20 +153,22 @@ exports.getModule = class WaitingForCallerModule extends MenuModule { } _refreshStats(cb) { - const fileAreaStats = StatLog.getSystemStat(SysProps.FileBaseAreaStats); - const sysMemStats = StatLog.getSystemStat(SysProps.SystemMemoryStats); - const sysLoadStats = StatLog.getSystemStat(SysProps.SystemLoadStats); + const fileAreaStats = StatLog.getSystemStat(SysProps.FileBaseAreaStats); + const sysMemStats = StatLog.getSystemStat(SysProps.SystemMemoryStats); + const sysLoadStats = StatLog.getSystemStat(SysProps.SystemLoadStats); + const lastLoginStats = StatLog.getSystemStat(SysProps.LastLogin); + + const now = moment(); // Some stats we can just fill right away this.stats = { // Date/Time - date : moment().format(this.getDateFormat()), - time : moment().format(this.getTimeFormat()), - dateTime : moment().format(this.getDateTimeFormat()), + nowDate : now.format(this.getDateFormat()), + nowTime : now.format(this.getTimeFormat()), + now : now.format(this._dateTimeFormat('now')), // Current process (our Node.js service) processUptimeSeconds : process.uptime(), -// processUptime : moment.duration(process.uptime(), 'seconds').humanize(), // Totals totalCalls : StatLog.getSystemStatNum(SysProps.LoginCount), @@ -174,22 +182,22 @@ exports.getModule = class WaitingForCallerModule extends MenuModule { // totalDownloads : // totalDownloadBytes : - // :TODO: lastCaller - // :TODO: totalMemoryBytes, freeMemoryBytes - // :TODO: CPU info/averages/load - // Today's Stats callsToday : StatLog.getSystemStatNum(SysProps.LoginsToday), postsToday : StatLog.getSystemStatNum(SysProps.MessagesToday), - // uploadsToday : - // uploadBytesToday : - // downloadsToday : - // downloadBytesToday : + uploadsToday : StatLog.getSystemStatNum(SysProps.FileUlTodayCount), + uploadBytesToday : StatLog.getSystemStatNum(SysProps.FileUlTodayBytes), + downloadsToday : StatLog.getSystemStatNum(SysProps.FileDlTodayCount), + downloadsBytesToday : StatLog.getSystemStatNum(SysProps.FileDlTodayBytes), // Current - // lastCaller : - // lastCallerDate - // lastCallerTime + currentUserName : this.client.user.username, + currentUserRealName : this.client.user.getProperty(UserProps.RealName) || this.client.user.username, + lastLoginUserName : lastLoginStats.userName, + lastLoginRealName : lastLoginStats.realName, + lastLoginDate : moment(lastLoginStats.timestamp).format(this.getDateFormat()), + lastLoginTime : moment(lastLoginStats.timestamp).format(this.getTimeFormat()), + lastLogin : moment(lastLoginStats.timestamp).format(this._dateTimeFormat('lastLogin')), totalMemoryBytes : sysMemStats.totalBytes, freeMemoryBytes : sysMemStats.freeBytes, @@ -275,5 +283,10 @@ exports.getModule = class WaitingForCallerModule extends MenuModule { return cb(null); } + + _dateTimeFormat(element) { + const format = this.config[`${element}DateTimeFormat`]; + return format || this.getDateFormat(); + } };