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

better connection error reporting

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-02-14 13:27:56 +01:00
parent d49c7d5e45
commit 30037dad83
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/api/src/controllers/databaseConnections.js
View File

@@ -71,6 +71,11 @@ module.exports = {
handle_error(conid, database, props) { handle_error(conid, database, props) {
const { error } = props; const { error } = props;
logger.error(`Error in database connection ${conid}, database ${database}: ${error}`); logger.error(`Error in database connection ${conid}, database ${database}: ${error}`);
if (props?.msgid) {
const [resolve, reject] = this.requests[props?.msgid];
reject(error);
delete this.requests[props?.msgid];
}
}, },
handle_response(conid, database, { msgid, ...response }) { handle_response(conid, database, { msgid, ...response }) {
const [resolve, reject] = this.requests[msgid]; const [resolve, reject] = this.requests[msgid];

6
packages/api/src/proc/databaseConnectionProcess.js
View File

@@ -427,7 +427,11 @@ function start() {
await handleMessage(message); await handleMessage(message);
} catch (err) { } catch (err) {
logger.error(extractErrorLogData(err), 'Error in DB connection'); logger.error(extractErrorLogData(err), 'Error in DB connection');
process.send({ msgtype: 'error', error: extractErrorMessage(err, 'Error processing message') }); process.send({
msgtype: 'error',
error: extractErrorMessage(err, 'Error processing message'),
msgid: message?.msgid,
});
} }
}); });
} }

2
packages/api/src/utility/useController.js
View File

@@ -86,7 +86,7 @@ module.exports = function useController(app, electron, route, controller) {
detail: err.detail, detail: err.detail,
}); });
} else { } else {
res.status(500).json({ apiErrorMessage: err.message }); res.status(500).json({ apiErrorMessage: (_.isString(err) ? err : err.message) ?? 'Unknown error' });
} }
} }
}); });