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

v6.1.2.0 

Change log: https://roxy-wi.org/changelog.py#6_1_2
pull/328/head
Pavel Loginov 2022-07-16 10:09:34 +03:00
parent ab76f83c20
commit a73981dc5d
3 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/create_db.py
View File

@ -200,9 +200,12 @@ def default_values():
{'param': 'us-east-1', 'name': 'N. Virginia', 'optgroup': 'US East', 'section': 'region', 'provider': 'aws', {'param': 'us-east-1', 'name': 'N. Virginia', 'optgroup': 'US East', 'section': 'region', 'provider': 'aws',
'image': '/inc/images/provisioning/flags/us.svg'}, 'image': '/inc/images/provisioning/flags/us.svg'},
{'param': 'us-east-2', 'name': 'Ohio', 'optgroup': 'US East', 'section': 'region', 'provider': 'aws', 'image': '/inc/images/provisioning/flags/us.svg'}, {'param': 'us-east-2', 'name': 'Ohio', 'optgroup': 'US East', 'section': 'region', 'provider': 'aws', 'image': '/inc/images/provisioning/flags/us.svg'},
{'param': 'us-west-1', 'name': 'N. California', 'optgroup': 'US West', 'section': 'region', 'provider': 'aws', 'image': '/inc/images/provisioning/flags/us.svg'}, {'param': 'us-west-1', 'name': 'N. California', 'optgroup': 'US West', 'section': 'region', 'provider': 'aws',
{'param': 'us-west-2', 'name': 'Oregon', 'optgroup': 'US West', 'section': 'region', 'provider': 'aws', 'image': '/inc/images/provisioning/flags/us.svg'}, 'image': '/inc/images/provisioning/flags/us.svg'},
{'param': 'af-south-1', 'name': 'Cape Town', 'optgroup': 'Africa', 'section': 'region', 'provider': 'aws', 'image': '/inc/images/provisioning/flags/za.svg'}, {'param': 'us-west-2', 'name': 'Oregon', 'optgroup': 'US West', 'section': 'region', 'provider': 'aws',
'image': '/inc/images/provisioning/flags/us.svg'},
{'param': 'af-south-1', 'name': 'Cape Town', 'optgroup': 'Africa', 'section': 'region', 'provider': 'aws',
'image': '/inc/images/provisioning/flags/za.svg'},
{'param': 'ap-east-1', 'name': 'Hong Kong', 'optgroup': 'Asia Pacific', 'section': 'region', 'provider': 'aws', {'param': 'ap-east-1', 'name': 'Hong Kong', 'optgroup': 'Asia Pacific', 'section': 'region', 'provider': 'aws',
'image': '/inc/images/provisioning/flags/hk.svg'}, 'image': '/inc/images/provisioning/flags/hk.svg'},
{'param': 'ap-south-1', 'name': 'Mumbai', 'optgroup': 'Asia Pacific', 'section': 'region', 'provider': 'aws', {'param': 'ap-south-1', 'name': 'Mumbai', 'optgroup': 'Asia Pacific', 'section': 'region', 'provider': 'aws',

4
app/funct.py
View File

@ -1048,8 +1048,12 @@ def upload_and_restart(server_ip, cfg, **kwargs):
from pathlib import Path from pathlib import Path
diff = '' diff = ''
try:
old_cfg = kwargs.get('oldcfg') old_cfg = kwargs.get('oldcfg')
path = Path(old_cfg) path = Path(old_cfg)
except Exception:
old_cfg = ''
path = Path(old_cfg)
if not path.is_file(): if not path.is_file():
old_cfg = tmp_file + '.old' old_cfg = tmp_file + '.old'

38
inc/script.js
View File

@ -1455,8 +1455,12 @@ function returnNiceCheckingConfig(data) {
output = data.split('<br>') output = data.split('<br>')
var alerts = []; var alerts = [];
var alert_warning = ''; var alert_warning = '';
var alert_warning2 = '';
var alert_error = ''; var alert_error = '';
var second_alert = false;
alerts.push(output[0] + '\n' + output[1]); alerts.push(output[0] + '\n' + output[1]);
var server_name = output[0];
var server_name2 = '';
try { try {
for (var i = 0; i < output.length; i++) { for (var i = 0; i < output.length; i++) {
if (i > 1) { if (i > 1) {
@ -1475,14 +1479,38 @@ function returnNiceCheckingConfig(data) {
} }
if (element.indexOf('[WARNING]') != '-1' || element.indexOf('[ALER]') != '-1' || element.indexOf('[warn]') != '-1') { if (element.indexOf('[WARNING]') != '-1' || element.indexOf('[ALER]') != '-1' || element.indexOf('[warn]') != '-1') {
element = removeEmptyLines(element); element = removeEmptyLines(element);
console.log(element);
if (second_alert == false) {
alert_warning = alert_warning + element; alert_warning = alert_warning + element;
} else {
alert_warning2 = alert_warning2 + element;
server_name = 'Master server:'
server_name2 = 'Slave server:'
} }
}
if (second_alert && output.length > 4 && output[1].indexOf('[NOTICE]') == '-1') {
server_name = 'Master server:'
server_name2 = 'Slave server:'
}
if (element.length === 0) {
second_alert = true;
}
}) })
if (alert_error != '') { if (alert_error) {
toastr.error('<pre style="padding: 0; margin: 0;">' + alert_error + '</pre>'); toastr.error(server_name + '<pre style="padding: 0; margin: 0;">' + alert_error + '</pre>');
toastr.info('Config not applied'); toastr.info('Config not applied');
} else if (alert_warning != '') { } else if (alert_warning) {
toastr.warning('<pre style="padding: 0; margin: 0;">' + alert_warning + '</pre>'); toastr.warning(server_name + '<pre style="padding: 0; margin: 0;">' + alert_warning + '</pre>');
toastr.success('<b>Configuration file is valid</b>'); toastr.success('<b>' + server_name + ' Configuration file is valid</b>');
} else {
toastr.success('<b>' + server_name + ' Configuration file is valid</b>');
}
if (alert_warning2) {
toastr.warning(server_name2 + '<pre style="padding: 0; margin: 0;">' + alert_warning2 + '</pre>');
toastr.success('<b>' + server_name2 + ' Configuration file is valid</b>');
} else if (server_name2) {
toastr.success('<b>' + server_name2 + ' Configuration file is valid</b>');
} }
} }