github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v7.3.2.0: Refactor server.js for improved readability and logic correction 

The changes include better indentation for increased clarity. A sleep function with random duration was inserted into `serverIsUp` function for pacing. Additional changes include uncommenting server status messages and updating the attribute setting for 'slavefor' to reflect accurate data. Lastly, instead of removing the server_div on an error in the EventSource, the source itself is now closed.
pull/390/head
Aidaho 2024-07-20 08:56:11 +03:00
parent 74562243f3
commit dd86feb32f
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/static/js/admin/server.js
View File

@ -371,7 +371,9 @@ function showServerInfo(id, ip) {
} }
}); });
} }
function serverIsUp(server_id) { async function serverIsUp(server_id) {
let random_sleep = getRandomArbitrary(1000, 10000);
await sleep(random_sleep);
const source = new EventSource(`/app/server/check/server/${server_id}`); const source = new EventSource(`/app/server/check/server/${server_id}`);
let server_div = $('#server_status-' + server_id); let server_div = $('#server_status-' + server_id);
source.onmessage = function (event) { source.onmessage = function (event) {
@ -380,17 +382,17 @@ function serverIsUp(server_id) {
server_div.removeClass('serverNone'); server_div.removeClass('serverNone');
server_div.removeClass('serverDown'); server_div.removeClass('serverDown');
server_div.addClass('serverUp'); server_div.addClass('serverUp');
// server_div.attr('title', 'Server is reachable'); server_div.attr('title', 'Server is reachable');
} else if (data.status === 'down') { } else if (data.status === 'down') {
server_div.removeClass('serverNone'); server_div.removeClass('serverNone');
server_div.removeClass('serverUp'); server_div.removeClass('serverUp');
server_div.addClass('serverDown'); server_div.addClass('serverDown');
// server_div.attr('title', 'Server is unreachable'); server_div.attr('title', 'Server is unreachable');
} else { } else {
server_div.removeClass('serverDown'); server_div.removeClass('serverDown');
server_div.removeClass('serverUp'); server_div.removeClass('serverUp');
server_div.addClass('serverNone'); server_div.addClass('serverNone');
// server_div.attr('title', 'Cannot get server status'); server_div.attr('title', 'Cannot get server status');
} }
$('#hostname-' + server_id).val(data.name); $('#hostname-' + server_id).val(data.name);
$('#ip-' + server_id).val(data.ip); $('#ip-' + server_id).val(data.ip);
@ -416,13 +418,13 @@ function serverIsUp(server_id) {
$('#enable-' + server_id).checkboxradio("refresh"); $('#enable-' + server_id).checkboxradio("refresh");
$('#servergroup-' + server_id).val(data.group_id).change(); $('#servergroup-' + server_id).val(data.group_id).change();
$('#credentials-' + server_id).val(data.creds_id).change(); $('#credentials-' + server_id).val(data.creds_id).change();
$('#slavefor-' + server_id).val(data.creds_id).change(); $('#slavefor-' + server_id).val(data.slave).change();
$('#servergroup-' + server_id).selectmenu("refresh"); $('#servergroup-' + server_id).selectmenu("refresh");
$('#credentials-' + server_id).selectmenu("refresh"); $('#credentials-' + server_id).selectmenu("refresh");
$('#slavefor-' + server_id).selectmenu("refresh"); $('#slavefor-' + server_id).selectmenu("refresh");
} }
source.onerror = function (event) { source.onerror = function (event) {
server_div.remove(); source.close();
} }
} }
function openChangeServerServiceDialog(server_id) { function openChangeServerServiceDialog(server_id) {