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

Fix schedule issue

This commit is contained in:
Bryan Ashby 2018-12-14 23:21:33 -07:00
parent b903b2ee82
commit a3ba57b0b8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/scanner_tossers/ftn_bso.js
View File

@ -2177,8 +2177,8 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
Log.debug( Log.debug(
{ {
schedule : this.moduleConfig.schedule.export, schedule : this.moduleConfig.schedule.export,
schedOK : -1 === exportSchedule.sched.error, schedOK : -1 === _.get(exportSchedule, 'sched.error'),
next : moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'), next : exportSchedule.sched ? moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
immediate : exportSchedule.immediate ? true : false, immediate : exportSchedule.immediate ? true : false,
}, },
'Export schedule loaded' 'Export schedule loaded'
@ -2206,8 +2206,8 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
Log.debug( Log.debug(
{ {
schedule : this.moduleConfig.schedule.import, schedule : this.moduleConfig.schedule.import,
schedOK : -1 === importSchedule.sched.error, schedOK : -1 === _.get(importSchedule, 'sched.error'),
next : moment(later.schedule(importSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'), next : importSchedule.sched ? moment(later.schedule(importSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
watchFile : _.isString(importSchedule.watchFile) ? importSchedule.watchFile : 'None', watchFile : _.isString(importSchedule.watchFile) ? importSchedule.watchFile : 'None',
}, },
'Import schedule loaded' 'Import schedule loaded'

6
core/servers/login/websocket.js
View File

@ -203,7 +203,11 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
ws.isConnectionAlive = false; // pong will reset this ws.isConnectionAlive = false; // pong will reset this
Log.trace('Ping to remote WebSocket client'); Log.trace('Ping to remote WebSocket client');
return ws.ping('', false); // false=don't mask try {
ws.ping('', false); // false=don't mask
} catch(e) { // don't barf on closing state
/* nothing */
}
}); });
} }
}); });