mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-05-03 09:24:00 +00:00
handler message errors
This commit is contained in:
@@ -137,6 +137,13 @@ module.exports = {
|
|||||||
socket.emit(`runner-progress-${runid}`, { ...progressData, progressName: name });
|
socket.emit(`runner-progress-${runid}`, { ...progressData, progressName: name });
|
||||||
},
|
},
|
||||||
|
|
||||||
|
handle_copyStreamError(conid, database, { copyStreamError }) {
|
||||||
|
const { progressName } = copyStreamError;
|
||||||
|
const { runid } = progressName;
|
||||||
|
logger.error(`Error in database connection ${conid}, database ${database}: ${copyStreamError}`);
|
||||||
|
socket.emit(`runner-done-${runid}`);
|
||||||
|
},
|
||||||
|
|
||||||
async ensureOpened(conid, database) {
|
async ensureOpened(conid, database) {
|
||||||
const existing = this.opened.find(x => x.conid == conid && x.database == database);
|
const existing = this.opened.find(x => x.conid == conid && x.database == database);
|
||||||
if (existing) return existing;
|
if (existing) return existing;
|
||||||
@@ -177,7 +184,13 @@ module.exports = {
|
|||||||
const { msgtype } = message;
|
const { msgtype } = message;
|
||||||
if (handleProcessCommunication(message, subprocess)) return;
|
if (handleProcessCommunication(message, subprocess)) return;
|
||||||
if (newOpened.disconnected) return;
|
if (newOpened.disconnected) return;
|
||||||
this[`handle_${msgtype}`](conid, database, message);
|
const funcName = `handle_${msgtype}`;
|
||||||
|
if (!this[funcName]) {
|
||||||
|
logger.error(`Unknown message type ${msgtype} from subprocess databaseConnectionProcess`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this[funcName](conid, database, message);
|
||||||
});
|
});
|
||||||
subprocess.on('exit', () => {
|
subprocess.on('exit', () => {
|
||||||
if (newOpened.disconnected) return;
|
if (newOpened.disconnected) return;
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ async function copyStream(input, output, options) {
|
|||||||
msgtype: 'copyStreamError',
|
msgtype: 'copyStreamError',
|
||||||
copyStreamError: {
|
copyStreamError: {
|
||||||
message: extractErrorMessage(err),
|
message: extractErrorMessage(err),
|
||||||
|
progressName,
|
||||||
...err,
|
...err,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -169,7 +169,7 @@
|
|||||||
|
|
||||||
const handleGenerateScript = async e => {
|
const handleGenerateScript = async e => {
|
||||||
const values = $formValues as any;
|
const values = $formValues as any;
|
||||||
const code = await createImpExpScript($extensions, values, 'script', true);
|
const code = await createImpExpScript($extensions, values, 'script', false);
|
||||||
openNewTab(
|
openNewTab(
|
||||||
{
|
{
|
||||||
title: 'Shell #',
|
title: 'Shell #',
|
||||||
|
|||||||
Reference in New Issue
Block a user