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

Checkpoing on WFC

This commit is contained in:
Bryan Ashby 2020-11-27 22:35:03 -07:00
parent b1f061b478
commit b075cbae65
No known key found for this signature in database
GPG Key ID: B49EB437951D2542
3 changed files with 159 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
art/themes/luciano_blocktronics/theme.hjson
View File

@ -246,6 +246,34 @@
}
}
mainMenuWaitingForCaller: {
config: {
quickLogLevel: warn
quickLogLevelIndicators: {
trace : |00|02T
debug: |00|03D
info: |00|15I
warn: |00|14W
error: |00|12E
fatal: |00|28F
}
}
0: {
mci: {
VM1: {
height: 5
widht: 37
itemFormat: "|00|11{node:<3.2} |10{userName:>13} |08> |04{action:<14.13} |14{serverName}"
}
VM2: {
height: 5
width: 73
itemFormat: "{levelIndicator} |15{timestamp} |07{message}"
}
}
}
}
messageBaseMessageList: {
config: {
dateTimeFormat: ddd MMM Do

8
core/view_controller.js
View File

@ -254,9 +254,7 @@ function ViewController(options) {
const view = self.getView(viewId);
if(!view) {
self.client.log.warn( { viewId : viewId }, 'Cannot find view');
nextItem(null);
return;
return nextItem(null);
}
const mciConf = config.mci[mci];
@ -276,11 +274,9 @@ function ViewController(options) {
err => {
// default to highest ID if no 'submit' entry present
if(!submitId) {
var highestIdView = self.getView(highestId);
const highestIdView = self.getView(highestId);
if(highestIdView) {
highestIdView.submit = true;
} else {
self.client.log.warn( { highestId : highestId }, 'View does not exist');
}
}

151
core/wfc.js
View File

@ -4,12 +4,15 @@ const { MenuModule } = require('./menu_module');
const { getActiveConnectionList } = require('./client_connections');
const StatLog = require('./stat_log');
const SysProps = require('./system_property');
const Log = require('./logger');
const Config = require('./config.js').get;
// deps
const async = require('async');
const _ = require('lodash');
const moment = require('moment');
const SysInfo = require('systeminformation');
const bunyan = require('bunyan');
exports.moduleInfo = {
name : 'WFC',
@ -62,6 +65,26 @@ exports.getModule = class WaitingForCallerModule extends MenuModule {
// return this.validateMCIByViewIds('main', requiredCodes, callback);
return callback(null);
},
(callback) => {
const quickLogView = this.viewControllers.main.getView(MciViewIds.main.quickLogView);
if (!quickLogView) {
return callback(null);
}
const logLevel = this.config.quickLogLevel ||
_.get(Config(), 'logging.rotatingFile.level') ||
'info';
this.logRingBuffer = new bunyan.RingBuffer({ limit : quickLogView.dimens.height || 24 });
Log.log.addStream({
name : 'wfc-ringbuffer',
type : 'raw',
level : logLevel,
stream : this.logRingBuffer
});
return callback(null);
},
(callback) => {
return this._refreshStats(callback);
},
@ -70,14 +93,59 @@ exports.getModule = class WaitingForCallerModule extends MenuModule {
}
],
err => {
if (!err) {
this._startRefreshing();
}
return cb(err);
}
);
});
}
leave() {
this._stopRefreshing();
super.leave();
}
_startRefreshing() {
this.mainRefreshTimer = setInterval( () => {
this._refreshAll();
}, 5000);
}
_stopRefreshing() {
if (this.mainRefreshTimer) {
clearInterval(this.mainRefreshTimer);
delete this.mainRefreshTimer;
}
}
_refreshAll(cb) {
async.series(
[
(callback) => {
return this._refreshStats(callback);
},
(callback) => {
return this._refreshNodeStatus(callback);
},
(callback) => {
return this._refreshQuickLog(callback);
}
],
err => {
if (cb) {
return cb(err);
}
}
);
}
_refreshStats(cb) {
const fileAreaStats = StatLog.getSystemStat(SysProps.FileBaseAreaStats);
const sysMemStats = StatLog.getSystemStat(SysProps.SystemMemoryStats);
const sysLoadStats = StatLog.getSystemStat(SysProps.SystemLoadStats);
// Some stats we can just fill right away
this.stats = {
@ -118,27 +186,14 @@ exports.getModule = class WaitingForCallerModule extends MenuModule {
// lastCaller :
// lastCallerDate
// lastCallerTime
totalMemoryBytes : sysMemStats.totalBytes,
freeMemoryBytes : sysMemStats.freeBytes,
systemAvgLoad : sysLoadStats.average,
systemCurrentLoad : sysLoadStats.current,
};
// Some async work required...
// :TODO: replace with stat log stats
const basicSysInfo = {
mem : 'total, free',
currentLoad : 'avgload, currentLoad',
};
SysInfo.get(basicSysInfo)
.then(sysInfo => {
this.stats.totalMemoryBytes = sysInfo.mem.total;
this.stats.freeMemoryBytes = sysInfo.mem.free;
// Not avail on BSD, yet.
this.stats.systemAvgLoad = _.get(sysInfo, 'currentLoad.avgload', 0);
this.stats.systemCurrentLoad = _.get(sysInfo, 'currentLoad.currentLoad', 0);
})
.catch(err => {
return cb(err);
});
return cb(null);
}
_refreshNodeStatus(cb) {
@ -147,15 +202,15 @@ exports.getModule = class WaitingForCallerModule extends MenuModule {
return cb(null);
}
const nodeStatusItems = getActiveConnectionList(false).slice(0, nodeStatusView.height).map(ac => {
const nodeStatusItems = getActiveConnectionList(false).slice(0, nodeStatusView.dimens.height).map(ac => {
// Handle pre-authenticated
if (!ac.authenticated) {
ac.text = ac.username = 'Pre Auth';
ac.text = ac.userName = 'Pre Auth';
ac.action = 'Logging In';
}
return Object.assign(ac, {
timeOn : _.upperFirst(ac.timeOn.humanize()), // make friendly
timeOn : _.upperFirst((ac.timeOn || moment.duration(0)).humanize()), // make friendly
});
});
@ -164,5 +219,57 @@ exports.getModule = class WaitingForCallerModule extends MenuModule {
return cb(null);
}
_refreshQuickLog(cb) {
const quickLogView = this.viewControllers.main.getView(MciViewIds.main.quickLogView);
if (!quickLogView) {
return cb(null);
}
const records = this.logRingBuffer.records;
if (records.length === 0) {
return cb(null);
}
const hasChanged = this.lastLogTime !== records[records.length - 1].time;
this.lastLogTime = records[records.length - 1].time;
if (!hasChanged) {
return cb(null);
}
const quickLogTimestampFormat = this.config.quickLogTimestampFormat ||
this.getDateTimeFormat('short');
const levelIndicators = this.config.quickLogLevelIndicators ||
{
trace : 'T',
debug : 'D',
info : 'I',
warn : 'W',
error : 'E',
fatal : 'F',
};
const makeLevelIndicator = (level) => {
return levelIndicators[bunyan.nameFromLevel[level]] || '?';
};
const logItems = records.map(rec => {
return {
timestamp : moment(rec.time).format(quickLogTimestampFormat),
level : rec.level,
levelIndicator : makeLevelIndicator(rec.level),
nodeId : rec.nodeId,
sessionId : rec.sessionId || '',
message : rec.msg,
};
});
quickLogView.setItems(logItems);
quickLogView.redraw();
return cb(null);
}
};