diff --git a/package-lock.json b/package-lock.json index b3cb27fc..c2f7d0a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,7 +79,7 @@ "jest": "29.7.0", "jest-junit": "16.0.0", "nodemon": "3.1.9", - "npm-check-updates": "17.1.18", + "npm-check-updates": "18.0.0", "nyc": "17.1.0", "parse-strings-in-object": "1.6.0", "pre-commit": "1.2.2", @@ -11191,9 +11191,9 @@ } }, "node_modules/npm-check-updates": { - "version": "17.1.18", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.18.tgz", - "integrity": "sha512-bkUy2g4v1i+3FeUf5fXMLbxmV95eG4/sS7lYE32GrUeVgQRfQEk39gpskksFunyaxQgTIdrvYbnuNbO/pSUSqw==", + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-18.0.0.tgz", + "integrity": "sha512-ymh9KF/xcGypQuCr5NQw1pAMRh5mHnQQDgHwM8gQBG8siG9XAKvcP9OtoARxFRgOjzEfjD6YtU/7KB2jJqGGlQ==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/package.json b/package.json index cda8a49c..00dfb2b4 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "jest": "29.7.0", "jest-junit": "16.0.0", "nodemon": "3.1.9", - "npm-check-updates": "17.1.18", + "npm-check-updates": "18.0.0", "nyc": "17.1.0", "parse-strings-in-object": "1.6.0", "pre-commit": "1.2.2", diff --git a/src/lib/logger.js b/src/lib/logger.js index a379c2b4..0c92b21e 100644 --- a/src/lib/logger.js +++ b/src/lib/logger.js @@ -1,18 +1,11 @@ const { loggerFactory, LOG_LEVELS } = require('@mojaloop/sdk-standard-components').Logger -const { hostname } = require('node:os') +const os = require('node:os') -const createLogger = (conf = {}) => { - const { - context = { - hostname: hostname() - }, - isJsonOutput = false - } = conf - - return loggerFactory({ context, isJsonOutput }) -} - -const logger = createLogger() // global logger +const logger = loggerFactory({ + context: 'TTK', + hostname: os.hostname(), + isJsonOutput: false +}) // global logger module.exports = { logger, diff --git a/src/lib/requestLogger.js b/src/lib/requestLogger.js index a4f49587..65c1d3a0 100644 --- a/src/lib/requestLogger.js +++ b/src/lib/requestLogger.js @@ -30,8 +30,7 @@ 'use strict' -const util = require('node:util') -const Logger = require('@mojaloop/central-services-logger') +const Logger = require('@mojaloop/central-services-logger').child({ context: 'TTK' }) const Config = require('./config') const NotificationEmitter = require('./notificationEmitter') const DBAdapter = require('./db/adapters/dbAdapter') @@ -128,21 +127,17 @@ const logMessage = (verbosity, message, externalData = {}) => { } switch (verbosity) { case 'debug': - Logger.debug(message) - if (data.additionalData !== undefined) Logger.debug(util.inspect(data.additionalData)) + Logger.debug(message, data.additionalData) break case 'warn': - Logger.warn(message) - if (data.additionalData !== undefined) Logger.warn(util.inspect(data.additionalData)) + Logger.warn(message, data.additionalData) break case 'error': - Logger.error(message) - if (data.additionalData !== undefined) Logger.error(util.inspect(data.additionalData)) + Logger.error(message, data.additionalData) break case 'info': default: { - Logger.info(message) - if (data.additionalData !== undefined) Logger.info(util.inspect(data.additionalData)) + Logger.info(message, data.additionalData) } } diff --git a/src/lib/test-outbound/TestCaseRunner.js b/src/lib/test-outbound/TestCaseRunner.js index 0bf1da94..6f8e00e5 100644 --- a/src/lib/test-outbound/TestCaseRunner.js +++ b/src/lib/test-outbound/TestCaseRunner.js @@ -40,7 +40,7 @@ const SKIP_EMPTY_EXECUTION_ORDER = false // skip testCases without executionOrde class TestCaseRunner { constructor (config, logger) { this.config = config - this.logger = logger || loggerFactory('TestCaseRunner') + this.logger = logger || loggerFactory('TTK') } async runAll ({ diff --git a/src/lib/test-outbound/outbound-initiator.js b/src/lib/test-outbound/outbound-initiator.js index deb0411a..4e963e39 100644 --- a/src/lib/test-outbound/outbound-initiator.js +++ b/src/lib/test-outbound/outbound-initiator.js @@ -396,7 +396,7 @@ const processTestCase = async ( ) } } catch (err) { - customLogger.logMessage('error', err.message) + customLogger.logMessage('error', err.message, { additionalData: err }) let resp try { resp = JSON.parse(err.message) @@ -839,7 +839,9 @@ const sendRequest = (convertedRequest, successCallbackUrl, errorCallbackUrl, dfs callbackHeaders = result.headers } customLogger.logMessage('info', 'Received error callback ' + errorCallbackUrl, { request: { headers: callbackHeaders, body: callbackBody }, notification: false }) - return reject(new Error(JSON.stringify({ curlRequest, requestSent, transformedRequest, syncResponse, callback: { url: errorCallbackUrl, headers: callbackHeaders, body: callbackBody, originalHeaders, originalBody } }))) + const error = new Error(JSON.stringify({ curlRequest, requestSent, transformedRequest, syncResponse, callback: { url: errorCallbackUrl, headers: callbackHeaders, body: callbackBody, originalHeaders, originalBody } })) + error.error = callbackBody + return reject(error) }) }