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

v5.2.4.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2_4
pull/304/head
Pavel Loginov 2021-08-24 16:25:34 +06:00
parent 342913a9f9
commit f44c6ed43b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/ha.js
View File

@ -163,7 +163,7 @@ function create_master_keepalived(hap, nginx, syn_flood) {
type: "POST", type: "POST",
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
showProvisioningError(data, '#creating-master', '#wait-mess', '#creating-error'); showProvisioningError(data, '#creating-master', '#wait-mess', '#creating-error');
} else if (data == '' ){ } else if (data == '' ){
showProvisioningWarning(step_id, 'master Keepalived', '#creating-warning', '#wait_mess'); showProvisioningWarning(step_id, 'master Keepalived', '#creating-warning', '#wait_mess');
@ -205,7 +205,7 @@ function create_slave_keepalived(hap, nginx, syn_flood) {
type: "POST", type: "POST",
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
showProvisioningError(data, '#creating-slave', '#wait-mess', '#creating-error'); showProvisioningError(data, '#creating-slave', '#wait-mess', '#creating-error');
} else if (data == '' ){ } else if (data == '' ){
showProvisioningWarning(step_id, 'slave Keepalived', '#creating-warning', '#wait_mess'); showProvisioningWarning(step_id, 'slave Keepalived', '#creating-warning', '#wait_mess');
@ -249,7 +249,7 @@ function create_keep_alived_hap(nginx, server) {
type: "POST", type: "POST",
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
showProvisioningError(data, step_id, '#wait-mess', '#creating-error'); showProvisioningError(data, step_id, '#wait-mess', '#creating-error');
} else if (data == '' ){ } else if (data == '' ){
showProvisioningWarning(step_id, install_step, '#creating-warning', '#wait_mess'); showProvisioningWarning(step_id, install_step, '#creating-warning', '#wait_mess');
@ -285,7 +285,7 @@ function create_keep_alived_nginx(server) {
type: "POST", type: "POST",
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
showProvisioningError(data, step_id, '#wait-mess', '#creating-error'); showProvisioningError(data, step_id, '#wait-mess', '#creating-error');
} else if (data == '' ){ } else if (data == '' ){
showProvisioningWarning(step_id, install_step, '#creating-warning', '#wait_mess'); showProvisioningWarning(step_id, install_step, '#creating-warning', '#wait_mess');

12
inc/users.js
View File

@ -77,7 +77,7 @@ $( function() {
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
$("#ajax").html('') $("#ajax").html('')
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
toastr.error(data); toastr.error(data);
} else if (data.indexOf('success') != '-1' ){ } else if (data.indexOf('success') != '-1' ){
toastr.remove(); toastr.remove();
@ -111,7 +111,7 @@ $( function() {
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
$("#ajax").html('') $("#ajax").html('')
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
toastr.clear(); toastr.clear();
toastr.error(data); toastr.error(data);
} else if (data.indexOf('success') != '-1' ){ } else if (data.indexOf('success') != '-1' ){
@ -141,7 +141,7 @@ $( function() {
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
$("#ajaxmon").html(''); $("#ajaxmon").html('');
if (data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
toastr.clear(); toastr.clear();
toastr.error(data);; toastr.error(data);;
} else if (data.indexOf('success') != '-1' ){ } else if (data.indexOf('success') != '-1' ){
@ -170,7 +170,7 @@ $( function() {
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
$("#ajaxmon").html(''); $("#ajaxmon").html('');
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
toastr.clear(); toastr.clear();
toastr.error(data); toastr.error(data);
} else if (data.indexOf('success') != '-1' ){ } else if (data.indexOf('success') != '-1' ){
@ -202,7 +202,7 @@ $( function() {
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
$("#ajaxmon").html(''); $("#ajaxmon").html('');
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
toastr.error(data); toastr.error(data);
} else if (data.indexOf('success') != '-1' ){ } else if (data.indexOf('success') != '-1' ){
toastr.clear(); toastr.clear();
@ -233,7 +233,7 @@ $( function() {
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g,' '); data = data.replace(/\s+/g,' ');
$("#ajaxmon").html(''); $("#ajaxmon").html('');
if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1') || data.indexOf('UNREACHABLE') != '-1') { if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
toastr.error(data); toastr.error(data);
} else if (data.indexOf('success') != '-1' ){ } else if (data.indexOf('success') != '-1' ){
toastr.clear(); toastr.clear();