diff --git a/mylogger.js b/mylogger.js index 5038af3..441fcbe 100644 --- a/mylogger.js +++ b/mylogger.js @@ -26,15 +26,14 @@ module.exports = class MyLogger { Object.assign(conf, localConfig); } - const defaultSchema = conf.srcDb.database; - function parseTable(tableString) { + function parseTable(tableString, defaultSchema) { let name, schema; const split = tableString.split('.'); if (split.length == 1) { name = split[0]; schema = defaultSchema; } else { - [name, schema] = split; + [schema, name] = split; } return {name, schema}; } @@ -42,8 +41,8 @@ module.exports = class MyLogger { const schemaMap = this.schemaMap; function addTable(tableConf, logInfo) { if (typeof tableConf == 'string') - tableConf = {name: tableConf}; - const table = parseTable(tableConf.name); + tableConf = {name: tableConf}; + const table = parseTable(tableConf.name, logInfo.schema); let tableMap = schemaMap.get(table.schema); if (!tableMap) { @@ -85,14 +84,16 @@ module.exports = class MyLogger { for (const logName in conf.logs) { const logConf = conf.logs[logName]; + const schema = logConf.schema || conf.srcDb.database; const logInfo = { conf: logConf, - table: parseTable(logConf.logTable), - mainTable: parseTable(logConf.mainTable) + schema, + table: parseTable(logConf.logTable, schema), + mainTable: parseTable(logConf.mainTable, schema) }; this.logMap.set(logName, logInfo); - const mainTable = addTable(logInfo.mainTable, logInfo); + const mainTable = addTable(logConf.mainTable, logInfo); mainTable.isMain = true; if (logConf.tables) diff --git a/package-lock.json b/package-lock.json index 4d6190b..51d424d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mylogger", - "version": "0.1.13", + "version": "0.1.14", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mylogger", - "version": "0.1.13", + "version": "0.1.14", "license": "GPL-3.0", "dependencies": { "colors": "^1.4.0", diff --git a/package.json b/package.json index dc396e6..21ff764 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mylogger", - "version": "0.1.13", + "version": "0.1.14", "author": "Verdnatura Levante SL", "description": "MySQL and MariaDB logger using binary log", "license": "GPL-3.0",