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

imrpoved closing inactive sessions

Browse Source
This commit is contained in:
Jan Prochazka
2022-11-13 17:21:47 +01:00
parent dc576e6ced
commit ecad1ae01b
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/api/src/controllers/sessions.js
View File

@@ -105,6 +105,8 @@ module.exports = {
}); });
subprocess.on('exit', () => { subprocess.on('exit', () => {
this.opened = this.opened.filter(x => x.sesid != sesid); this.opened = this.opened.filter(x => x.sesid != sesid);
this.dispatchMessage(sesid, 'Query session closed');
socket.emit(`session-closed-${sesid}`);
}); });
subprocess.send({ msgtype: 'connect', ...connection, database }); subprocess.send({ msgtype: 'connect', ...connection, database });

7
packages/web/src/tabs/QueryDesignTab.svelte
View File

@@ -80,8 +80,10 @@
function onSession(sid) { function onSession(sid) {
if (sid) { if (sid) {
apiOn(`session-done-${sid}`, handleSessionDone); apiOn(`session-done-${sid}`, handleSessionDone);
apiOn(`session-closed-${sid}`, handleSessionClosed);
return () => { return () => {
apiOff(`session-done-${sid}`, handleSessionDone); apiOff(`session-done-${sid}`, handleSessionDone);
apiOff(`session-closed-${sid}`, handleSessionClosed);
}; };
} }
return () => {}; return () => {};
@@ -197,6 +199,11 @@
timerLabel.stop(); timerLabel.stop();
}; };
const handleSessionClosed = () => {
sessionId = null;
handleSessionDone();
};
const handleChange = (value, skipUndoChain) => const handleChange = (value, skipUndoChain) =>
// @ts-ignore // @ts-ignore
dispatchModel({ dispatchModel({

7
packages/web/src/tabs/QueryTab.svelte
View File

@@ -125,8 +125,10 @@
function onSession(sid) { function onSession(sid) {
if (sid) { if (sid) {
apiOn(`session-done-${sid}`, handleSessionDone); apiOn(`session-done-${sid}`, handleSessionDone);
apiOn(`session-closed-${sid}`, handleSessionClosed);
return () => { return () => {
apiOff(`session-done-${sid}`, handleSessionDone); apiOff(`session-done-${sid}`, handleSessionDone);
apiOff(`session-closed-${sid}`, handleSessionClosed);
}; };
} }
return () => {}; return () => {};
@@ -279,6 +281,11 @@
timerLabel.stop(); timerLabel.stop();
}; };
const handleSessionClosed = () => {
sessionId = null;
handleSessionDone();
};
const { editorState, editorValue, setEditorData } = useEditorData({ const { editorState, editorValue, setEditorData } = useEditorData({
tabid, tabid,
loadFromArgs: loadFromArgs: