mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fixed server connection status bug

Browse Source
This commit is contained in:
Jan Prochazka 2021-01-23 17:08:17 +01:00
parent e2ea2809b6
commit c9fefd14fd
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
packages/api/src/controllers/serverConnections.js
View File

@ -2,6 +2,8 @@ const connections = require('./connections');
const socket = require('../utility/socket');
const { fork } = require('child_process');
const _ = require('lodash');
const AsyncLock = require('async-lock');
const lock = new AsyncLock();
module.exports = {
opened: [],
@ -22,34 +24,37 @@ module.exports = {
handle_ping() {},
async ensureOpened(conid) {
const existing = this.opened.find(x => x.conid == conid);
if (existing) return existing;
const connection = await connections.get({ conid });
const subprocess = fork(process.argv[1], ['serverConnectionProcess', ...process.argv.slice(3)]);
const newOpened = {
conid,
subprocess,
databases: [],
connection,
status: {
name: 'pending',
},
disconnected: false,
};
this.opened.push(newOpened);
delete this.closed[conid];
socket.emitChanged(`server-status-changed`);
// @ts-ignore
subprocess.on('message', ({ msgtype, ...message }) => {
if (newOpened.disconnected) return;
this[`handle_${msgtype}`](conid, message);
const res = await lock.acquire(conid, async () => {
const existing = this.opened.find(x => x.conid == conid);
if (existing) return existing;
const connection = await connections.get({ conid });
const subprocess = fork(process.argv[1], ['serverConnectionProcess', ...process.argv.slice(3)]);
const newOpened = {
conid,
subprocess,
databases: [],
connection,
status: {
name: 'pending',
},
disconnected: false,
};
this.opened.push(newOpened);
delete this.closed[conid];
socket.emitChanged(`server-status-changed`);
// @ts-ignore
subprocess.on('message', ({ msgtype, ...message }) => {
if (newOpened.disconnected) return;
this[`handle_${msgtype}`](conid, message);
});
subprocess.on('exit', () => {
if (newOpened.disconnected) return;
this.close(conid, false);
});
subprocess.send({ msgtype: 'connect', ...connection });
return newOpened;
});
subprocess.on('exit', () => {
if (newOpened.disconnected) return;
this.close(conid, false);
});
subprocess.send({ msgtype: 'connect', ...connection });
return newOpened;
return res;
},
close(conid, kill = true) {
@ -82,10 +87,12 @@ module.exports = {
ping_meta: 'post',
async ping({ connections }) {
for (const conid of connections) {
const opened = await this.ensureOpened(conid);
opened.subprocess.send({ msgtype: 'ping' });
}
await Promise.all(
connections.map(async conid => {
const opened = await this.ensureOpened(conid);
opened.subprocess.send({ msgtype: 'ping' });
})
);
return { status: 'ok' };
},