diff --git a/src/services/storage/index.ts b/src/services/storage/index.ts index 98f5124d..558c79c1 100644 --- a/src/services/storage/index.ts +++ b/src/services/storage/index.ts @@ -25,10 +25,10 @@ export default class { constructor(settings: StorageSettings) { this.settings = settings } - async Connect(migrations: Function[], metricsMigrations: Function []) { + async Connect(migrations: Function[], metricsMigrations: Function[]) { const { source, executedMigrations } = await NewDB(this.settings.dbSettings, migrations) this.DB = source - this.txQueue = new TransactionsQueue(this.DB) + this.txQueue = new TransactionsQueue("main", this.DB) this.userStorage = new UserStorage(this.DB, this.txQueue) this.productStorage = new ProductStorage(this.DB, this.txQueue) this.applicationStorage = new ApplicationStorage(this.DB, this.userStorage, this.txQueue) diff --git a/src/services/storage/metricsStorage.ts b/src/services/storage/metricsStorage.ts index d6c7c2a4..08a03715 100644 --- a/src/services/storage/metricsStorage.ts +++ b/src/services/storage/metricsStorage.ts @@ -15,7 +15,7 @@ export default class { async Connect(metricsMigrations: Function[]) { const { source, executedMigrations } = await newMetricsDb(this.settings.dbSettings, metricsMigrations) this.DB = source; - this.txQueue = new TransactionsQueue(this.DB) + this.txQueue = new TransactionsQueue("metrics", this.DB) return executedMigrations; } async SaveRoutingEvent(event: Partial) { diff --git a/src/services/storage/transactionsQueue.ts b/src/services/storage/transactionsQueue.ts index 900d1e6c..5f2fff8e 100644 --- a/src/services/storage/transactionsQueue.ts +++ b/src/services/storage/transactionsQueue.ts @@ -1,5 +1,5 @@ import { DataSource, EntityManager, EntityTarget } from "typeorm" -import { getLogger } from "../helpers/logger.js" +import { PubLogger, getLogger } from "../helpers/logger.js" export type TX = (entityManager: EntityManager | DataSource) => Promise export type TxOperation = { @@ -11,9 +11,10 @@ export default class { DB: DataSource | EntityManager pendingTx: boolean transactionsQueue: { op: TxOperation, res: (v: any) => void, rej: (message: string) => void }[] = [] - log = getLogger({}) - constructor(DB: DataSource | EntityManager) { + log: PubLogger + constructor(name: string, DB: DataSource | EntityManager) { this.DB = DB + this.log = getLogger({ appName: name }) } PushToQueue(op: TxOperation) {