diff --git a/controllers/api.js b/controllers/api.js index eec85f1..0909e27 100644 --- a/controllers/api.js +++ b/controllers/api.js @@ -128,14 +128,14 @@ router.post('/payinvoice', async function(req, res) { // obtaining a lock let lock = new Lock(redis, 'invoice_paying_for_' + u.getUserId()); if (!(await lock.obtainLock())) { - return errorTryAgainLater(res); + return errorGeneralServerError(res); } let userBalance; try { userBalance = await u.getCalculatedBalance(); } catch (Error) { - logger.log('', [req.id, 'error running getCalculatedBalance():', Error]); + logger.log('', [req.id, 'error running getCalculatedBalance():', Error.message]); lock.releaseLock(); return errorTryAgainLater(res); } @@ -269,7 +269,7 @@ router.get('/balance', postLimiter, async function(req, res) { if (balance < 0) balance = 0; res.send({ BTC: { AvailableBalance: balance } }); } catch (Error) { - logger.log('', [req.id, 'error:', Error]); + logger.log('', [req.id, 'error getting balance:', Error.message, 'userid:', u.getUserId()]); return errorGeneralServerError(res); } }); @@ -310,7 +310,7 @@ router.get('/gettxs', async function(req, res) { } res.send(txs); } catch (Err) { - logger.log('', [req.id, 'error:', Err]); + logger.log('', [req.id, 'error gettxs:', Err.message, 'userid:', u.getUserId()]); res.send([]); } }); @@ -330,7 +330,7 @@ router.get('/getuserinvoices', async function(req, res) { res.send(invoices); } } catch (Err) { - logger.log('', [req.id, 'error:', Err]); + logger.log('', [req.id, 'error getting user invoices:', Err.message, 'userid:', u.getUserId()]); res.send([]); } }); @@ -420,7 +420,7 @@ function errorGeneralServerError(res) { return res.send({ error: true, code: 6, - message: 'Server fault', + message: 'Something went wrong. Please try again later', }); } diff --git a/utils/logger.js b/utils/logger.js index eb7364d..cb58110 100644 --- a/utils/logger.js +++ b/utils/logger.js @@ -37,10 +37,6 @@ if (!fs.existsSync('logs')) { fs.mkdirSync('logs'); } -/** - * @param {string} label group label - * @param {string} message log message - */ function log(label, message) { logger.log({ level: 'info',