diff --git a/server/common/dbpool.js b/server/common/dbpool.js index 8b91427..b703173 100644 --- a/server/common/dbpool.js +++ b/server/common/dbpool.js @@ -42,9 +42,9 @@ async function internalCreateConn(app, name) { return dbObj.conn; } -async function getBcEventConn(app, method, ...args) { +async function internalDbConn(app, name, method, ...args) { try { - const conn = await internalCreateConn(app, constant.BCEVENTDB_NAME); + const conn = await internalCreateConn(app, name); const ret = await conn[method](...args); if (ret.err) { return { @@ -54,15 +54,24 @@ async function getBcEventConn(app, method, ...args) { 'rows': null }; } - - } catch (err) { return { - 'err': err, + 'err': null, 'conn': null, - 'row': null, - 'rows': null + 'row': ret.hasOwnProperty('row') ? ret['row'] : null, + 'rows': ret.hasOwnProperty('rows') ? ret['rows'] : null, }; - } + } catch (err) { + return { + 'err': err, + 'conn': null, + 'row': null, + 'rows': null + }; + }; +} + +async function getBcEventConn(app, method, ...args) { + const conn = await internalCreateConn(app, constant.BCEVENTDB_NAME); } async function getBcNftConn(app, method, ...args) {