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 server heartbeat logging error after deleting the server. #7540

Browse Source
This commit is contained in:
Rohit Bhati 2024-08-07 14:32:48 +05:30 committed by GitHub
parent 654dc0e2d7
commit 81d8ea56f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/static/js/heartbeat.js
View File

@ -28,7 +28,7 @@ export function send_heartbeat(_server_id, _item) {
.catch((error) => { .catch((error) => {
if (error && error.message == 'Network Error') { if (error && error.message == 'Network Error') {
pgAdmin.Browser.notifier.error(gettext(`pgAdmin server not responding, try to login again: ${error.message || error.response.data.errormsg}`)); pgAdmin.Browser.notifier.error(gettext(`pgAdmin server not responding, try to login again: ${error.message || error.response.data.errormsg}`));
} else { } else if (!error.response?.data?.data?.includes('Manager not found')) {
pgAdmin.Browser.notifier.error(gettext(`Server heartbeat logging error: ${error.message || error.response.data.errormsg}`)); pgAdmin.Browser.notifier.error(gettext(`Server heartbeat logging error: ${error.message || error.response.data.errormsg}`));
} }
stop_heartbeat(_item); stop_heartbeat(_item);

20
web/pgadmin/utils/heartbeat.py
View File

@ -25,22 +25,28 @@ def log_server_heartbeat(data):
) )
_server_heartbeat = getattr(current_app, '_pgadmin_server_heartbeat', {}) _server_heartbeat = getattr(current_app, '_pgadmin_server_heartbeat', {})
session_id = session.sid
if session.sid not in _server_heartbeat: if session_id not in _server_heartbeat:
_server_heartbeat[session.sid] = {} _server_heartbeat[session_id] = {}
if not manager: if not manager:
stop_server_heartbeat(data) stop_server_heartbeat(data)
return False, gettext("Manager not found. Stopped Heartbeat logging.") msg = gettext("Manager not found. Stopped Heartbeat logging.")
current_app.logger.error(
f"Manager not found. Stopped Heartbeat logging for the "
f"session id: {session_id} and server id: {data['sid']}"
)
return False, msg
else: else:
_server_heartbeat[session.sid][data['sid']] = { _server_heartbeat[session_id][data['sid']] = {
'timestamp': datetime.datetime.now(), 'timestamp': datetime.datetime.now(),
'conn': manager.connections 'conn': manager.connections
} }
current_app.logger.debug( current_app.logger.debug(
"Heartbeat logged for the session id##server id: {0}##{1}".format( f"Heartbeat logged for the session id: {session_id} and "
session.sid, data['sid'])) f"server id: {data['sid']}"
)
setattr(current_app, '_pgadmin_server_heartbeat', _server_heartbeat) setattr(current_app, '_pgadmin_server_heartbeat', _server_heartbeat)
return True, gettext("Heartbeat logged successfully.") return True, gettext("Heartbeat logged successfully.")