IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix orphan database connections resulting in an inability to connect to databases. #5567

Browse Source
This commit is contained in:
Khushboo Vashi
2023-01-19 15:57:02 +05:30
committed by GitHub
parent 22cc658dca
commit 6ae91592d1
10 changed files with 190 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/browser/static/js/browser.js
View File

@@ -15,6 +15,7 @@ import Notify, {initializeModalProvider, initializeNotifier} from '../../../stat
import { checkMasterPassword } from '../../../static/js/Dialogs/index';
import { pgHandleItemError } from '../../../static/js/utils';
import { Search } from './quick_search/trigger_search';
import { send_heartbeat } from './heartbeat';
define('pgadmin.browser', [
'sources/gettext', 'sources/url_for', 'require', 'jquery',
@@ -581,6 +582,10 @@ define('pgadmin.browser', [
.fail(function() {/*This is intentional (SonarQube)*/});
}, 300000);
obj.Events.on(
'pgadmin:server:connected', send_heartbeat.bind(obj)
);
obj.set_master_password('');
obj.check_corrupted_db_file();
obj.Events.on('pgadmin:browser:tree:add', obj.onAddTreeNode.bind(obj));

31
web/pgadmin/browser/static/js/heartbeat.js Normal file
View File

@@ -0,0 +1,31 @@
/////////////////////////////////////////////////////////////
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2023, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
import gettext from 'sources/gettext';
import url_for from 'sources/url_for';
import getApiInstance from '../../../static/js/api_instance';
import Notifier from '../../../static/js/helpers/Notifier';
import pgAdmin from 'sources/pgadmin';
const axiosApi = getApiInstance();
let HEARTBEAT_TIMEOUT = pgAdmin.heartbeat_timeout * 1000;
export function send_heartbeat(_server_id) {
// Send heartbeat to the server every 30 seconds
setInterval(function() {
axiosApi.post(url_for('misc.heartbeat'), {'sid': _server_id})
.then(() => {
// pass
})
.catch((error) => {
Notifier.error(gettext(`pgAdmin server not responding, try to login again: ${error.message || error.response.data.errormsg}`));
});
}, HEARTBEAT_TIMEOUT);
}