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

* Don't crash attempting to get desc from menu stack 

* Remove ring buffer monitor at WFC exit
This commit is contained in:
Bryan Ashby 2020-11-27 23:01:05 -07:00
parent b075cbae65
commit a64bbb1635
No known key found for this signature in database
GPG Key ID: B49EB437951D2542
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/client_connections.js
View File

@ -36,11 +36,19 @@ function getActiveConnectionList(authUsersOnly) {
const now = moment(); const now = moment();
return _.map(getActiveConnections(authUsersOnly), ac => { return _.map(getActiveConnections(authUsersOnly), ac => {
let action;
try {
// attempting to fetch a bad menu stack item can blow up/assert
action = _.get(ac, 'currentMenuModule.menuConfig.desc', 'Unknown');
} catch(e) {
action = 'Unknown';
}
const entry = { const entry = {
node : ac.node, node : ac.node,
authenticated : ac.user.isAuthenticated(), authenticated : ac.user.isAuthenticated(),
userId : ac.user.userId, userId : ac.user.userId,
action : _.get(ac, 'currentMenuModule.menuConfig.desc', 'Unknown'), action : action,
serverName : ac.session.serverName, serverName : ac.session.serverName,
isSecure : ac.session.isSecure, isSecure : ac.session.isSecure,
}; };

4
core/wfc.js
View File

@ -103,6 +103,10 @@ exports.getModule = class WaitingForCallerModule extends MenuModule {
} }
leave() { leave() {
_.remove(Log.log.streams, stream => {
return stream.name === 'wfc-ringbuffer';
});
this._stopRefreshing(); this._stopRefreshing();
super.leave(); super.leave();