dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-27 19:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

better error reporting

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-10-01 12:15:22 +02:00
parent 29a66bfcb0
commit ef23b786ac
23 changed files with 99 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/dbgate-plugin-mysql/src/backend/drivers.js
View File

@@ -3,7 +3,8 @@ const stream = require('stream');
const driverBases = require('../frontend/drivers');
const Analyser = require('./Analyser');
const mysql2 = require('mysql2');
const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];
const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames, extractErrorLogData } =
global.DBGATE_PACKAGES['dbgate-tools'];
const { MySqlDumper } = require('antares-mysql-dumper');
const logger = getLogger('mysqlDriver');
@@ -128,7 +129,7 @@ const drivers = driverBases.map(driverBase => ({
};
const handleError = error => {
logger.error({ error }, 'Stream error');
logger.error(extractErrorLogData(error), 'Stream error');
const { message } = error;
options.info({
message,

11
plugins/dbgate-plugin-postgres/src/backend/drivers.js
View File

@@ -5,8 +5,13 @@ const driverBases = require('../frontend/drivers');
const Analyser = require('./Analyser');
const pg = require('pg');
const pgCopyStreams = require('pg-copy-streams');
const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames, extractDbNameFromComposite } =
global.DBGATE_PACKAGES['dbgate-tools'];
const {
getLogger,
createBulkInsertStreamBase,
makeUniqueColumnNames,
extractDbNameFromComposite,
extractErrorLogData,
} = global.DBGATE_PACKAGES['dbgate-tools'];
const logger = getLogger('postreDriver');
@@ -155,7 +160,7 @@ const drivers = driverBases.map(driverBase => ({
});
query.on('error', error => {
logger.error({ error }, 'Stream error');
logger.error(extractErrorLogData(error), 'Stream error');
const { message, position, procName } = error;
let line = null;
if (position) {

4
plugins/dbgate-plugin-sqlite/src/backend/driver.js
View File

@@ -3,7 +3,7 @@ const stream = require('stream');
const driverBase = require('../frontend/driver');
const Analyser = require('./Analyser');
const { splitQuery, sqliteSplitterOptions } = require('dbgate-query-splitter');
const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];
const { getLogger, createBulkInsertStreamBase, extractErrorLogData } = global.DBGATE_PACKAGES['dbgate-tools'];
const logger = getLogger('sqliteDriver');
@@ -116,7 +116,7 @@ const driver = {
try {
inTransaction();
} catch (error) {
logger.error({ error }, 'Stream error');
logger.error(extractErrorLogData(error), 'Stream error');
const { message, procName } = error;
options.info({
message,