diff --git a/core/login_server_module.js b/core/login_server_module.js index d356f40f..1939601b 100644 --- a/core/login_server_module.js +++ b/core/login_server_module.js @@ -90,9 +90,9 @@ module.exports = class LoginServerModule extends ServerModule { client.on('idle timeout', idleLogoutSeconds => { client.log.info( - `Node ${client.node} idle timeout (${moment + `Node ${client.node} idle timeout of ${moment .duration(idleLogoutSeconds, 'seconds') - .humanize()}) expired; Kicking` + .humanize()} expired; Kicking` ); client.menuStack.goto('idleLogoff', err => { diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js index e4c2254f..f1593c5e 100644 --- a/core/scanner_tossers/ftn_bso.js +++ b/core/scanner_tossers/ftn_bso.js @@ -1678,9 +1678,7 @@ function FTNMessageScanTossModule() { self.appendTearAndOrigin(message); - const importConfig = { - localAreaTag: localAreaTag, - }; + const importConfig = { localAreaTag }; self.importMailToArea(importConfig, packetHeader, message, err => { if (err) { @@ -1702,7 +1700,7 @@ function FTNMessageScanTossModule() { uuid: message.messageUuid, MSGID: msgId, }, - `Not importing non-unique message "${message.subject}"` + `Not importing non-unique message ${localAreaTag}: "${message.subject}"` ); return next(null); @@ -1721,16 +1719,32 @@ function FTNMessageScanTossModule() { // // try to produce something helpful in the log // + const makeCount = obj => { + return obj + ? _.reduce( + obj, + (sum, c) => { + return sum + c; + }, + 0 + ) + : 0; + }; + const finalStats = Object.assign(importStats, { packetPath: packetPath }); - if (err || Object.keys(finalStats.areaFail).length > 0) { + const totalFail = makeCount(finalStats.areaFail) + finalStats.otherFail; + + if (err || totalFail > 0) { if (err) { Object.assign(finalStats, { error: err.message }); } - - Log.warn(finalStats, 'Import completed with error(s)'); + Log.warn(finalStats, `Import completed with ${totalFail} error(s)`); } else { - // :TODO: Output basic stats - total counts - to this message: - Log.info(finalStats, 'Import complete'); + const totalSuccess = makeCount(finalStats.areaSuccess); + Log.info( + finalStats, + `Import completed successfully with ${totalSuccess} messages` + ); } cb(err);