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

reporting SSH tunnel errors

Browse Source
This commit is contained in:
Jan Prochazka
2024-10-23 16:35:56 +02:00
parent 3b82679c2d
commit 14501a70b9
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/api/src/proc/sshForwardProcess.js
View File

@@ -3,7 +3,7 @@ const platformInfo = require('../utility/platformInfo');
const childProcessChecker = require('../utility/childProcessChecker');
const { handleProcessCommunication } = require('../utility/processComm');
const { SSHConnection } = require('../utility/SSHConnection');
const { getLogger, extractErrorLogData } = require('dbgate-tools');
const { getLogger, extractErrorLogData, extractErrorMessage } = require('dbgate-tools');
const logger = getLogger('sshProcess');
@@ -46,7 +46,7 @@ async function handleStart({ connection, tunnelConfig }) {
msgtype: 'error',
connection,
tunnelConfig,
errorMessage: err.message,
errorMessage: extractErrorMessage(err.message),
});
}
}

3
packages/api/src/utility/sshTunnel.js
View File

@@ -50,7 +50,7 @@ function callForwardProcess(connection, tunnelConfig, tunnelCacheKey) {
resolve(subprocess);
}
if (msgtype == 'error') {
reject(errorMessage);
reject(new Error(errorMessage));
}
});
subprocess.on('exit', code => {
@@ -91,6 +91,7 @@ async function getSshTunnel(connection) {
};
return sshTunnelCache[tunnelCacheKey];
} catch (err) {
logger.error(extractErrorLogData(err), 'Error creating SSH tunnel:');
// error is not cached
return {
state: 'error',