diff --git a/lib/coinatmradar/coinatmradar.js b/lib/coinatmradar/coinatmradar.js index 7474ae7f..2186f6e9 100644 --- a/lib/coinatmradar/coinatmradar.js +++ b/lib/coinatmradar/coinatmradar.js @@ -16,21 +16,19 @@ const MAX_CONTENT_LENGTH = 2000 // How long a machine can be down before it's considered offline const STALE_INTERVAL = '2 minutes' -module.exports = {update, mapRecord} +module.exports = { update, mapRecord } function mapCoin (info, deviceId, cryptoCode) { const config = info.config - const rates = info.rates[cryptoCode] || {cashIn: null, cashOut: null} + const rates = info.rates[cryptoCode] || { cashIn: null, cashOut: null } const cryptoConfig = configManager.scoped(cryptoCode, deviceId, config) const unscoped = configManager.unscoped(config) const showRates = unscoped.coinAtmRadarShowRates const cashInFee = showRates ? cryptoConfig.cashInCommission / 100 : null const cashOutFee = showRates ? cryptoConfig.cashOutCommission / 100 : null - const cashInRate = showRates ? _.invoke('cashIn.toNumber', rates) : null + const cashInRate = showRates ? _.invoke('cashIn.toNumber', rates) : null const cashOutRate = showRates ? _.invoke('cashOut.toNumber', rates) : null - - return { cryptoCode, @@ -151,9 +149,9 @@ function update (info) { return mapRecord(info) .then(sendRadar) - .catch(err => logger.error(err)) + .catch(err => logger.error(`Failure to update CoinATMRadar`, err)) } function computeOperatorId (masterSeed) { - return hkdf(masterSeed, 32, {salt: 'lamassu-server-salt', info: 'operator-id'}).toString('hex') + return hkdf(masterSeed, 32, { salt: 'lamassu-server-salt', info: 'operator-id' }).toString('hex') } diff --git a/lib/logger.js b/lib/logger.js index 29556e81..0531717b 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -1,6 +1,6 @@ const winston = require('winston') const options = require('./options') -const _ = require('lodash') +const _ = require('lodash/fp') const logger = new winston.Logger({ level: options.logLevel, @@ -8,8 +8,7 @@ const logger = new winston.Logger({ new (winston.transports.Console)({ timestamp: true, colorize: true }) ], rewriters: [ - (...[,, meta]) => _.hasIn('toString', meta) - ? meta.toString() : 'Error, no further information is available' + (...[,, meta]) => meta instanceof Error ? { message: meta.message, stack: meta.stack } : meta ] })