@mojaloop/central-ledger 19.4.0 → 19.4.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [19.4.1](https://github.com/mojaloop/central-ledger/compare/v19.4.0...v19.4.1) (2025-04-01)
+
+
+### Bug Fixes
+
+* use context logger ([#1162](https://github.com/mojaloop/central-ledger/issues/1162)) ([6776926](https://github.com/mojaloop/central-ledger/commit/6776926a895294ec310c7b467d14caae635a1bb4))
+
 ## [19.4.0](https://github.com/mojaloop/central-ledger/compare/v19.3.0...v19.4.0) (2025-03-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/central-ledger",
-  "version": "19.4.0",
+  "version": "19.4.1",
   "description": "Central ledger hosted by a scheme to record and settle transfers",
   "license": "Apache-2.0",
   "author": "ModusBox",
@@ -89,9 +89,9 @@
     "@hapi/vision": "7.0.3",
     "@mojaloop/central-services-error-handling": "13.0.7",
     "@mojaloop/central-services-health": "15.0.4",
-    "@mojaloop/central-services-logger": "11.8.0",
+    "@mojaloop/central-services-logger": "11.8.1",
     "@mojaloop/central-services-metrics": "12.5.0",
-    "@mojaloop/central-services-shared": "18.23.1",
+    "@mojaloop/central-services-shared": "18.23.2",
     "@mojaloop/central-services-stream": "11.5.2",
     "@mojaloop/database-lib": "11.1.4",
     "@mojaloop/event-sdk": "14.4.0",
@@ -104,7 +104,7 @@
     "base64url": "3.0.1",
     "blipp": "4.0.2",
     "commander": "13.1.0",
-    "cron": "4.1.0",
+    "cron": "4.1.3",
     "decimal.js": "10.5.0",
     "docdash": "2.0.2",
     "event-stream": "4.0.1",

package/src/api/ledgerAccountTypes/handler.js

@@ -30,7 +30,7 @@
 
 const LedgerAccountTypesService = require('../../domain/ledgerAccountTypes')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getAll = async function () {
   return LedgerAccountTypesService.getAll()

package/src/api/participants/handler.js

@@ -32,11 +32,11 @@ const ParticipantService = require('../../domain/participant')
 const UrlParser = require('../../lib/urlParser')
 const Config = require('../../lib/config')
 const Util = require('@mojaloop/central-services-shared').Util
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Enums = require('../../lib/enumCached')
 const SettlementService = require('../../domain/settlement')
-const rethrow = Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const LocalEnum = {
   activated: 'activated',

package/src/api/settlementModels/handler.js

@@ -34,8 +34,8 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Enums = require('../../lib/enumCached')
 const Util = require('@mojaloop/central-services-shared').Util
 const Enum = require('@mojaloop/central-services-shared').Enum.Settlements
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 const entityItem = ({ settlementModelId, name, isActive, settlementGranularityId, settlementInterchangeId, settlementDelayId, currencyId, requireLiquidityCheck, ledgerAccountTypeId, autoPositionReset }, ledgerAccountIds, settlementGranularityIds, settlementInterchangeIds, settlementDelayIds) => {
   return {

package/src/api/transactions/handler.js

@@ -29,7 +29,7 @@
 'use strict'
 
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const Transaction = require('../../domain/transactions')
 

package/src/domain/bulkTransfer/index.js

@@ -42,7 +42,7 @@ const BulkTransferStateChangeModel = require('../../models/bulkTransfer/bulkTran
 const IndividualTransferModel = require('../../models/bulkTransfer/individualTransfer')
 const IndividualTransferExtensionModel = require('../../models/transfer/transferExtension')
 const MLNumber = require('@mojaloop/ml-number')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 
 const getBulkTransferById = async (id) => {
   try {

package/src/domain/position/abort.js

@@ -37,7 +37,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Config = require('../../lib/config')
 const Utility = require('@mojaloop/central-services-shared').Util
 const MLNumber = require('@mojaloop/ml-number')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 
 /**
  * @function processPositionAbortBin

package/src/domain/position/binProcessor.js

@@ -29,7 +29,7 @@
  ******/
 'use strict'
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const BatchPositionModel = require('../../models/position/batch')
 const BatchPositionModelCached = require('../../models/position/batchCached')
 const PositionPrepareDomain = require('./prepare')

package/src/domain/position/fulfil.js

@@ -38,7 +38,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Config = require('../../lib/config')
 const Utility = require('@mojaloop/central-services-shared').Util
 const MLNumber = require('@mojaloop/ml-number')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const TransferObjectTransform = require('../../domain/transfer/transform')
 
 /**

package/src/domain/position/fx-fulfil.js

@@ -37,7 +37,7 @@ const { Enum } = require('@mojaloop/central-services-shared')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Config = require('../../lib/config')
 const Utility = require('@mojaloop/central-services-shared').Util
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 
 /**
  * @function processPositionFxFulfilBin

package/src/domain/position/fx-prepare.js

@@ -38,7 +38,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Config = require('../../lib/config')
 const Utility = require('@mojaloop/central-services-shared').Util
 const MLNumber = require('@mojaloop/ml-number')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 
 /**
  * @function processFxPositionPrepareBin

package/src/domain/position/fx-timeout-reserved.js

@@ -38,7 +38,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Config = require('../../lib/config')
 const Utility = require('@mojaloop/central-services-shared').Util
 const MLNumber = require('@mojaloop/ml-number')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 
 /**
  * @function processPositionFxTimeoutReservedBin

package/src/domain/position/prepare.js

@@ -37,7 +37,7 @@ const { Enum } = require('@mojaloop/central-services-shared')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Utility = require('@mojaloop/central-services-shared').Util
 const MLNumber = require('@mojaloop/ml-number')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const Config = require('../../lib/config')
 
 /**

package/src/domain/position/timeout-reserved.js

@@ -38,7 +38,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Config = require('../../lib/config')
 const Utility = require('@mojaloop/central-services-shared').Util
 const MLNumber = require('@mojaloop/ml-number')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 
 /**
  * @function processPositionTimeoutReservedBin

package/src/domain/transfer/transform.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Util = require('@mojaloop/central-services-shared').Util
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 const transferProperties = [

package/src/handlers/admin/handler.js

@@ -34,7 +34,7 @@
  * @module src/handlers/transfers
  */
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const Kafka = require('@mojaloop/central-services-shared').Util.Kafka
 const Consumer = require('@mojaloop/central-services-stream').Util.Consumer
 const Enum = require('@mojaloop/central-services-shared').Enum
@@ -46,7 +46,7 @@ const Db = require('../../lib/db')
 const httpPostRelatedActions = [Enum.Events.Event.Action.RECORD_FUNDS_IN, Enum.Events.Event.Action.RECORD_FUNDS_OUT_PREPARE_RESERVE]
 const httpPutRelatedActions = [Enum.Events.Event.Action.RECORD_FUNDS_OUT_COMMIT, Enum.Events.Event.Action.RECORD_FUNDS_OUT_ABORT]
 const allowedActions = [].concat(httpPostRelatedActions).concat(httpPutRelatedActions)
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const createRecordFundsInOut = async (payload, transactionTimestamp, enums) => {
   /** @namespace Db.getKnex **/

package/src/handlers/bulk/fulfil/handler.js

@@ -29,7 +29,7 @@
  ******/
 'use strict'
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../../shared/logger').logger
 const BulkTransferService = require('../../../domain/bulkTransfer')
 const Util = require('@mojaloop/central-services-shared').Util
 const Kafka = require('@mojaloop/central-services-shared').Util.Kafka
@@ -45,7 +45,7 @@ const Comparators = require('@mojaloop/central-services-shared').Util.Comparator
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 const location = { module: 'BulkFulfilHandler', method: '', path: '' } // var object used as pointer
-const rethrow = Util.rethrow.with('CL')
+const rethrow = require('../../../shared/rethrow')
 const consumerCommit = true
 const fromSwitch = true
 

package/src/handlers/bulk/get/handler.js

@@ -28,7 +28,7 @@
  ******/
 'use strict'
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../../shared/logger').logger
 const EventSdk = require('@mojaloop/event-sdk')
 const Util = require('@mojaloop/central-services-shared').Util
 const Kafka = require('@mojaloop/central-services-shared').Util.Kafka
@@ -44,7 +44,7 @@ const Validator = require('../shared/validator')
 const { ERROR_HANDLING } = require('../../../lib/config')
 
 const location = { module: 'BulkGetHandler', method: '', path: '' }
-const rethrow = Util.rethrow.with('CL')
+const rethrow = require('../../../shared/rethrow')
 
 const consumerCommit = true
 const fromSwitch = true

package/src/handlers/bulk/index.js

@@ -35,7 +35,7 @@ const BulkPrepareHandlers = require('./prepare/handler')
 const BulkFulfilHandlers = require('./fulfil/handler')
 const BulkProcessingHandlers = require('./processing/handler')
 const GetBulkTransferHandlers = require('./get/handler')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 
 /**
  * @function RegisterAllHandlers

package/src/handlers/bulk/prepare/handler.js

@@ -30,7 +30,7 @@
  ******/
 'use strict'
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../../shared/logger').logger
 const BulkTransferService = require('../../../domain/bulkTransfer')
 const Util = require('@mojaloop/central-services-shared').Util
 const Kafka = require('@mojaloop/central-services-shared').Util.Kafka
@@ -47,7 +47,7 @@ const Comparators = require('@mojaloop/central-services-shared').Util.Comparator
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 const location = { module: 'BulkPrepareHandler', method: '', path: '' } // var object used as pointer
-const rethrow = Util.rethrow.with('CL')
+const rethrow = require('../../../shared/rethrow')
 const consumerCommit = true
 const fromSwitch = true
 

package/src/handlers/bulk/processing/handler.js

@@ -29,7 +29,7 @@
  ******/
 'use strict'
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../../shared/logger').logger
 const BulkTransferService = require('../../../domain/bulkTransfer')
 const Util = require('@mojaloop/central-services-shared').Util
 const Producer = require('@mojaloop/central-services-stream').Util.Producer
@@ -44,7 +44,7 @@ const Kafka = Util.Kafka
 const HeaderValidation = Util.HeaderValidation
 
 const location = { module: 'BulkProcessingHandler', method: '', path: '' } // var object used as pointer
-const rethrow = Util.rethrow.with('CL')
+const rethrow = require('../../../shared/rethrow')
 const consumerCommit = true
 const fromSwitch = true
 

package/src/handlers/index.js

@@ -33,7 +33,7 @@
  * @module Handlers CLI Startup
  */
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../shared/logger').logger
 const Config = require('../lib/config')
 const Setup = require('../shared/setup')
 const PJson = require('../../package.json')

package/src/handlers/positions/handler.js

@@ -38,7 +38,7 @@
  * @module src/handlers/positions
  */
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const EventSdk = require('@mojaloop/event-sdk')
 const TransferService = require('../../domain/transfer')
 const TransferObjectTransform = require('../../domain/transfer/transform')
@@ -58,7 +58,7 @@ const decodeMessages = require('@mojaloop/central-services-shared').Util.Streami
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 const location = { module: 'PositionHandler', method: '', path: '' } // var object used as pointer
-const rethrow = Utility.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 const consumerCommit = true
 const fromSwitch = true
 

package/src/handlers/positions/handlerBatch.js

@@ -50,7 +50,7 @@ const decodePayload = require('@mojaloop/central-services-shared').Util.Streamin
 const { BATCHING } = require('../../shared/constants')
 
 const consumerCommit = true
-const rethrow = Utility.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function positions

package/src/handlers/register.js

@@ -46,7 +46,7 @@
  * @returns {boolean} - Returns a boolean: true if successful, or throws and error if failed
  */
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../shared/logger').logger
 const requireGlob = require('require-glob')
 const TransferHandlers = require('./transfers/handler')
 const PositionHandlers = require('./positions/handler')

package/src/handlers/timeouts/handler.js

@@ -46,7 +46,7 @@ const TimeoutService = require('../../domain/timeout')
 const { logger } = require('../../shared/logger')
 
 const { Kafka, resourceVersions } = Utility
-const rethrow = Utility.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 const { Action, Type } = Enum.Events.Event
 
 let timeoutJob

package/src/handlers/transfers/FxFulfilService.js

@@ -35,7 +35,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const { Type, Action } = Enum.Events.Event
 const { SOURCE, DESTINATION } = Enum.Http.Headers.FSPIOP
 const { TransferState, TransferInternalState } = Enum.Transfers
-const rethrow = Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 const consumerCommit = true
 const fromSwitch = true
 

package/src/handlers/transfers/handler.js

@@ -38,7 +38,7 @@
  * @module src/handlers/transfers
  */
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const EventSdk = require('@mojaloop/event-sdk')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Metrics = require('@mojaloop/central-services-metrics')
@@ -65,7 +65,7 @@ const TransferEventType = Enum.Events.Event.Type
 const TransferEventAction = Enum.Events.Event.Action
 const decodePayload = Util.StreamingProtocol.decodePayload
 
-const rethrow = Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 const consumerCommit = true
 const fromSwitch = true
 

package/src/handlers/transfers/prepare.js

@@ -50,7 +50,7 @@ const { FSPIOPErrorCodes } = ErrorHandler.Enums
 const { createFSPIOPError, reformatFSPIOPError } = ErrorHandler.Factory
 const { fspId } = Config.INSTRUMENTATION_METRICS_LABELS
 
-const rethrow = Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 const consumerCommit = true
 const fromSwitch = true
 const proxyEnabled = Config.PROXY_CACHE_CONFIG.enabled

package/src/handlers/transfers/validator.js

@@ -37,7 +37,7 @@
  * @module src/handlers/transfers
  */
 
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const Decimal = require('decimal.js')
 const Config = require('../../lib/config')
 const Participant = require('../../domain/participant')

package/src/lib/enum.js

@@ -31,7 +31,7 @@
 
 const Config = require('./config')
 const Db = require('./db')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../shared/logger').logger
 
 const endpointType = async function () {
   try {

package/src/lib/healthCheck/subServiceHealth.js

@@ -27,7 +27,7 @@
 'use strict'
 
 const { statusEnum, serviceName } = require('@mojaloop/central-services-shared').HealthCheck.HealthCheckEnums
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const Consumer = require('@mojaloop/central-services-stream').Util.Consumer
 const ProxyCache = require('../proxyCache')
 const MigrationLockModel = require('../../models/misc/migrationLock')

package/src/models/bulkTransfer/bulkTransfer.js

@@ -27,7 +27,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getById = async (id) => {
   try {

package/src/models/bulkTransfer/bulkTransferAssociation.js

@@ -30,7 +30,7 @@
 const Db = require('../../lib/db')
 const Time = require('@mojaloop/central-services-shared').Util.Time
 const LibUtil = require('@mojaloop/central-services-shared').Util
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 exports.create = async (bulkTransferAssociation) => {
   try {

package/src/models/bulkTransfer/bulkTransferDuplicateCheck.js

@@ -32,8 +32,8 @@
  */
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function GetBulkTransferDuplicateCheck

package/src/models/bulkTransfer/bulkTransferExtension.js

@@ -27,7 +27,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getByBulkTransferId = async (id) => {
   try {

package/src/models/bulkTransfer/bulkTransferFulfilmentDuplicateCheck.js

@@ -32,8 +32,8 @@
  */
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function GetBulkTransferFulfilmentDuplicateCheck

package/src/models/bulkTransfer/bulkTransferStateChange.js

@@ -27,8 +27,8 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 const create = async (stateChange) => {
   Logger.isDebugEnabled && Logger.debug('save bulkTransferStateChange' + stateChange.toString())

package/src/models/bulkTransfer/facade.js

@@ -34,7 +34,7 @@ const Db = require('../../lib/db')
 const Enum = require('@mojaloop/central-services-shared').Enum
 const Time = require('@mojaloop/central-services-shared').Util.Time
 // const BulkTransferAssociation = require('./BulkTransferAssociation')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const saveBulkTransferReceived = async (payload, participants, stateReason = null, isValid = true) => {
   try {

package/src/models/bulkTransfer/individualTransfer.js

@@ -27,7 +27,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getAllById = async (id) => {
   try {

package/src/models/fxTransfer/duplicateCheck.js

@@ -37,7 +37,7 @@ const Metrics = require('@mojaloop/central-services-metrics')
 const Db = require('../../lib/db')
 const { logger } = require('../../shared/logger')
 const { TABLE_NAMES } = require('../../shared/constants')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const histName = 'model_fx_transfer'
 

package/src/models/fxTransfer/fxTransfer.js

@@ -45,7 +45,7 @@ const Db = require('../../lib/db')
 const participant = require('../participant/facade')
 const ParticipantCachedModel = require('../participant/participantCached')
 const TransferExtensionModel = require('./fxTransferExtension')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const { TransferInternalState } = Enum.Transfers
 

package/src/models/fxTransfer/fxTransferError.js

@@ -32,7 +32,7 @@
  */
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getByCommitRequestId = async (id) => {
   try {

package/src/models/fxTransfer/fxTransferExtension.js

@@ -29,7 +29,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getByCommitRequestId = async (commitRequestId, isFulfilment = false, isError = false) => {
   try {

package/src/models/fxTransfer/fxTransferTimeout.js

@@ -28,10 +28,10 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const Enum = require('@mojaloop/central-services-shared').Enum
 const TS = Enum.Transfers.TransferInternalState
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const cleanup = async () => {
   Logger.isDebugEnabled && Logger.debug('cleanup fxTransferTimeout')

package/src/models/fxTransfer/stateChange.js

@@ -36,7 +36,7 @@
 const TransferError = require('../../models/transfer/transferError')
 const Db = require('../../lib/db')
 const { TABLE_NAMES } = require('../../shared/constants')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const table = TABLE_NAMES.fxTransferStateChange
 

package/src/models/fxTransfer/watchList.js

@@ -29,7 +29,7 @@
 const Db = require('../../lib/db')
 const { TABLE_NAMES } = require('../../shared/constants')
 const { logger } = require('../../shared/logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getItemInWatchListByCommitRequestId = async (commitRequestId) => {
   logger.debug(`get item in watch list (commitRequestId=${commitRequestId})`)

package/src/models/ilpPackets/ilpPacket.js

@@ -28,7 +28,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 exports.getById = async (id) => {
   try {

package/src/models/ledgerAccountType/ledgerAccountType.js

@@ -32,7 +32,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 /* istanbul ignore next */
 exports.getLedgerAccountByName = async (name, trx = null) => {

package/src/models/misc/segment.js

@@ -28,7 +28,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getByParams = async (params) => {
   try {

package/src/models/participant/externalParticipant.js

@@ -29,7 +29,7 @@
 const Db = require('../../lib/db')
 const { logger } = require('../../shared/logger')
 const { TABLE_NAMES, DB_ERROR_CODES } = require('../../shared/constants')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const TABLE = TABLE_NAMES.externalParticipant
 const ID_FIELD = 'externalParticipantId'

package/src/models/participant/externalParticipantCached.js

@@ -29,7 +29,7 @@
 const Metrics = require('@mojaloop/central-services-metrics')
 const cache = require('../../lib/cache')
 const externalParticipantModel = require('./externalParticipant')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 let cacheClient
 let epAllCacheKey

package/src/models/participant/facade.js

@@ -45,7 +45,7 @@ const externalParticipantModelCached = require('../../models/participant/externa
 const Config = require('../../lib/config')
 const SettlementModelModel = require('../settlement/settlementModel')
 const { logger } = require('../../shared/logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getByNameAndCurrency = async (name, currencyId, ledgerAccountTypeId, isCurrencyActive) => {
   const histTimerParticipantGetByNameAndCurrencyEnd = Metrics.getHistogram(

package/src/models/participant/participant.js

@@ -31,7 +31,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 exports.getAll = async () => {
   try {

package/src/models/participant/participantCached.js

@@ -30,7 +30,7 @@
 const Cache = require('../../lib/cache')
 const ParticipantModel = require('../../models/participant/participant')
 const Metrics = require('@mojaloop/central-services-metrics')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 let cacheClient
 let participantsAllCacheKey

package/src/models/participant/participantCurrency.js

@@ -28,7 +28,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 exports.create = async (participantId, currencyId, ledgerAccountTypeId, isActive = true) => {
   try {

package/src/models/participant/participantCurrencyCached.js

@@ -31,7 +31,7 @@ const Cache = require('../../lib/cache')
 const Config = require('../../../src/lib/config')
 const ParticipantCurrencyModel = require('../../models/participant/participantCurrency')
 const Metrics = require('@mojaloop/central-services-metrics')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 let cacheClient
 let participantCurrencyAllCacheKey

package/src/models/participant/participantLimit.js

@@ -33,7 +33,7 @@
 
 const Db = require('../../lib/db')
 const ParticipantCurrencyModel = require('./participantCurrencyCached')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const insert = async (participantLimit) => {
   try {

package/src/models/participant/participantLimitCached.js

@@ -30,7 +30,7 @@
 const Cache = require('../../lib/cache')
 const ParticipantLimitModel = require('../../models/participant/participantLimit')
 const Metrics = require('@mojaloop/central-services-metrics')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 let cacheClient
 let participantLimitAllCacheKey

package/src/models/participant/participantPosition.js

@@ -37,7 +37,7 @@
 
 const Db = require('../../lib/db')
 const ParticipantCurrencyModel = require('./participantCurrencyCached')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function GetByParticipantCurrencyId

package/src/models/participant/participantPositionChange.js

@@ -33,7 +33,7 @@
 
 const Db = require('../../lib/db')
 const Metrics = require('@mojaloop/central-services-metrics')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function getByParticipantPositionId

package/src/models/position/batch.js

@@ -33,7 +33,7 @@
 const Db = require('../../lib/db')
 const TransferExtensionModel = require('../transfer/transferExtension')
 const { Enum } = require('@mojaloop/central-services-shared')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const startDbTransaction = async () => {
   const knex = await Db.getKnex()

package/src/models/position/batchCached.js

@@ -33,7 +33,7 @@
 const Cache = require('../../lib/cache')
 const Metrics = require('@mojaloop/central-services-metrics')
 const BatchPositionModel = require('./batch')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 let cacheClient
 let participantCurrencyAllCacheKey

package/src/models/position/facade.js

@@ -37,12 +37,12 @@ const Db = require('../../lib/db')
 const Enum = require('@mojaloop/central-services-shared').Enum
 const participantFacade = require('../participant/facade')
 const SettlementModelCached = require('../../models/settlement/settlementModelCached')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const Time = require('@mojaloop/central-services-shared').Util.Time
 const MLNumber = require('@mojaloop/ml-number')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Config = require('../../lib/config')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const Metrics = require('@mojaloop/central-services-metrics')
 

package/src/models/position/participantPosition.js

@@ -28,7 +28,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const insert = async (participantPosition) => {
   try {

package/src/models/position/participantPositionChanges.js

@@ -29,7 +29,7 @@
 
 const Db = require('../../lib/db')
 const Enum = require('@mojaloop/central-services-shared').Enum
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const getReservedPositionChangesByCommitRequestId = async (commitRequestId) => {
   try {

package/src/models/settlement/settlementModel.js

@@ -29,7 +29,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 /* istanbul ignore next */
 exports.create = async (name, isActive, settlementGranularityId, settlementInterchangeId, settlementDelayId, currencyId, requireLiquidityCheck, ledgerAccountTypeId, settlementAccountTypeId, autoPositionReset, trx = null) => {

package/src/models/settlement/settlementModelCached.js

@@ -30,7 +30,7 @@
 const Cache = require('../../lib/cache')
 const SettlementModel = require('../../models/settlement/settlementModel')
 const Metrics = require('@mojaloop/central-services-metrics')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 let cacheClient
 let settlementModelsAllCacheKey

package/src/models/transfer/facade.js

@@ -48,7 +48,7 @@ const Config = require('../../lib/config')
 const ParticipantFacade = require('../participant/facade')
 const ParticipantCachedModel = require('../participant/participantCached')
 const TransferExtensionModel = require('./transferExtension')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const TransferEventAction = Enum.Events.Event.Action
 const TransferInternalState = Enum.Transfers.TransferInternalState

package/src/models/transfer/ilpPacket.js

@@ -30,7 +30,7 @@
 
 const Db = require('../../lib/db')
 const Util = require('@mojaloop/central-services-shared').Util
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 exports.saveIlpPacket = async (record) => {
   try {

package/src/models/transfer/transfer.js

@@ -28,8 +28,8 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 const getById = async (transferId) => {
   try {

package/src/models/transfer/transferDuplicateCheck.js

@@ -32,9 +32,9 @@
  */
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const Metrics = require('@mojaloop/central-services-metrics')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function GetTransferDuplicateCheck

package/src/models/transfer/transferError.js

@@ -33,8 +33,8 @@
  */
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function Insert

package/src/models/transfer/transferErrorDuplicateCheck.js

@@ -32,8 +32,8 @@
  */
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function GetTransferFulfilmentDuplicateCheck

package/src/models/transfer/transferExtension.js

@@ -31,7 +31,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 
 const saveTransferExtension = async (extension) => {
   try {

package/src/models/transfer/transferFulfilment.js

@@ -28,8 +28,8 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 const getByTransferId = async (transferId) => {
   Logger.isDebugEnabled && Logger.debug('getByTransferId ' + transferId.toString())

package/src/models/transfer/transferFulfilmentDuplicateCheck.js

@@ -32,8 +32,8 @@
  */
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 /**
  * @function GetTransferFulfilmentDuplicateCheck

package/src/models/transfer/transferParticipant.js

@@ -28,8 +28,8 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 const saveTransferParticipant = async (record) => {
   Logger.isDebugEnabled && Logger.debug('save transferParticipant' + record.toString())

package/src/models/transfer/transferStateChange.js

@@ -30,8 +30,8 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const Logger = require('../../shared/logger').logger
+const rethrow = require('../../shared/rethrow')
 
 const saveTransferStateChange = async (stateChange) => {
   Logger.isDebugEnabled && Logger.debug('save transferStateChange' + stateChange.toString())

package/src/models/transfer/transferTimeout.js

@@ -28,9 +28,9 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../../shared/logger').logger
 const Enum = require('@mojaloop/central-services-shared').Enum
-const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('CL')
+const rethrow = require('../../shared/rethrow')
 const TS = Enum.Transfers.TransferInternalState
 
 const cleanup = async () => {

package/src/schema/bulkTransfer.js

@@ -29,7 +29,7 @@
 'use strict'
 
 const mongoose = require('mongoose')
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../shared/logger').logger
 
 // single transfer model
 const transfer = {

package/src/shared/rethrow.js

@@ -0,0 +1,8 @@
+const rethrow = require('@mojaloop/central-services-shared').Util.rethrow
+const loggerOverride = require('./logger').logger
+
+module.exports = {
+  rethrowDatabaseError: (error, options) => rethrow.rethrowDatabaseError(error, { ...options, loggerOverride }),
+  rethrowCachedDatabaseError: (error, options) => rethrow.rethrowCachedDatabaseError(error, { ...options, loggerOverride }),
+  rethrowAndCountFspiopError: (error, options) => rethrow.rethrowAndCountFspiopError(error, { ...options, loggerOverride }, 'CL')
+}

package/src/shared/setup.js

@@ -36,7 +36,7 @@
 const Hapi = require('@hapi/hapi')
 const MongoUriBuilder = require('mongo-uri-builder')
 const ObjStoreDb = require('@mojaloop/object-store-lib').Db
-const Logger = require('@mojaloop/central-services-logger')
+const Logger = require('../shared/logger').logger
 const Metrics = require('@mojaloop/central-services-metrics')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')