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

v6.2.2.0 

Changelog: https://roxy-wi.org/changelog#6_2_2
pull/343/head
Pavel Loginov 2022-10-30 20:22:05 +03:00
parent a6121d7242
commit 36617a452d
5 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/add.py
View File

@ -396,17 +396,7 @@ if form.getvalue('generateconfig') is None and serv is not None:
funct.logging(serv, "add.py add new %s" % name) funct.logging(serv, "add.py add new %s" % name)
MASTERS = sql.is_master(serv) output = funct.master_slave_upload_and_restart(serv, cfg, just_save="save")
for master in MASTERS:
if master[0] is not None:
slave_output = funct.upload_and_restart(master[0], cfg)
slave_output = '<br>' + master[1] + ':\n' + slave_output
output = funct.upload_and_restart(serv, cfg, just_save="save")
output = '<br>' + server_name + ':\n' + output
output = output + slave_output
if output: if output:
print(output) print(output)
else: else:

11
app/add_nginx.py
View File

@ -96,17 +96,8 @@ if form.getvalue('generateconfig') is None and serv is not None:
funct.logging(serv, "add_nginx.py add new %s" % config_name) funct.logging(serv, "add_nginx.py add new %s" % config_name)
MASTERS = sql.is_master(serv) output = funct.master_slave_upload_and_restart(serv, cfg, just_save="save", nginx=1, config_file_name=config_file_name)
for master in MASTERS:
if master[0] is not None:
slave_output = funct.upload_and_restart(master[0], cfg, nginx=1, config_file_name=config_file_name)
slave_output = '<br>' + master[1] + ':\n' + slave_output
output = funct.upload_and_restart(serv, cfg, just_save="save", nginx=1, config_file_name=config_file_name)
output = '<br>' + server_name + ':\n' + output
output = output + slave_output
if output: if output:
print(output) print(output)
else: else:

21
app/funct.py
View File

@ -393,9 +393,7 @@ def get_config(server_ip, cfg, **kwargs):
with ssh_connect(server_ip) as ssh: with ssh_connect(server_ip) as ssh:
ssh.get_sftp(config_path, cfg) ssh.get_sftp(config_path, cfg)
except Exception as e: except Exception as e:
print('error: cannot get config') logging('Roxy-WI server', f'error: cannot get config: {e}', roxywi=1)
logging('Roxy-WI server', str(e), roxywi=1)
return
def diff_config(oldcfg, cfg, **kwargs): def diff_config(oldcfg, cfg, **kwargs):
@ -962,7 +960,7 @@ def upload_and_restart(server_ip: str, cfg: str, **kwargs):
try: try:
get_config(server_ip, old_cfg, service=service, config_file_name=config_path) get_config(server_ip, old_cfg, service=service, config_file_name=config_path)
except Exception: except Exception:
logging('Roxy-WI server', ' Cannot download config', roxywi=1) logging('Roxy-WI server', 'Cannot download config for diff', roxywi=1)
try: try:
diff = diff_config(old_cfg, cfg, return_diff=1) diff = diff_config(old_cfg, cfg, return_diff=1)
except Exception as e: except Exception as e:
@ -995,7 +993,6 @@ def upload_and_restart(server_ip: str, cfg: str, **kwargs):
def master_slave_upload_and_restart(server_ip, cfg, just_save, **kwargs): def master_slave_upload_and_restart(server_ip, cfg, just_save, **kwargs):
import sql import sql
masters = sql.is_master(server_ip)
slave_output = '' slave_output = ''
try: try:
@ -1008,13 +1005,13 @@ def master_slave_upload_and_restart(server_ip, cfg, just_save, **kwargs):
else: else:
login = '' login = ''
for master in masters: is_master = [masters[0] for masters in sql.is_master(server_ip)]
if master[0] is not None: if is_master[0] is not None:
slv_output = upload_and_restart( slv_output = upload_and_restart(
master[0], cfg, just_save=just_save, nginx=kwargs.get('nginx'), waf=kwargs.get('waf'), is_master[0], cfg, just_save=just_save, nginx=kwargs.get('nginx'), waf=kwargs.get('waf'),
apache=kwargs.get('apache'), config_file_name=kwargs.get('config_file_name'), slave=1 apache=kwargs.get('apache'), config_file_name=kwargs.get('config_file_name'), slave=1
) )
slave_output += f'<br>{master[1]}:\n{slv_output}' slave_output += f'<br>slave_server:\n{slv_output}'
output = upload_and_restart( output = upload_and_restart(
server_ip, cfg, just_save=just_save, nginx=kwargs.get('nginx'), waf=kwargs.get('waf'), server_ip, cfg, just_save=just_save, nginx=kwargs.get('nginx'), waf=kwargs.get('waf'),

6
app/options.py
View File

@ -3547,7 +3547,7 @@ if form.getvalue('awsvalidate') or form.getvalue('awseditvalidate'):
workspace = form.getvalue('awseditvalidate') workspace = form.getvalue('awseditvalidate')
group = form.getvalue('aws_edit_group') group = form.getvalue('aws_edit_group')
cmd = 'cd scripts/terraform/ && sudo terraform plan -no-color -input=false -target=module.aws_module -var-file vars/' + workspace + '_' + group + '_aws.tfvars' cmd = f'cd scripts/terraform/ && sudo terraform plan -no-color -input=false -target=module.aws_module -var-file vars/{workspace}_{group}_aws.tfvars'
output, stderr = funct.subprocess_execute(cmd) output, stderr = funct.subprocess_execute(cmd)
if stderr != '': if stderr != '':
print('error: ' + stderr) print('error: ' + stderr)
@ -3569,7 +3569,7 @@ if form.getvalue('awsworkspace'):
firewall = form.getvalue('aws_create_firewall') firewall = form.getvalue('aws_create_firewall')
public_ip = form.getvalue('aws_create_public_ip') public_ip = form.getvalue('aws_create_public_ip')
cmd = 'cd scripts/terraform/ && sudo terraform workspace new ' + workspace + '_' + group + '_aws' cmd = f'cd scripts/terraform/ && sudo terraform workspace new {workspace}_{group}_aws'
output, stderr = funct.subprocess_execute(cmd) output, stderr = funct.subprocess_execute(cmd)
if stderr != '': if stderr != '':
@ -3623,7 +3623,7 @@ if form.getvalue('awseditworkspace'):
): ):
try: try:
cmd = 'cd scripts/terraform/ && sudo terraform workspace select ' + workspace + '_' + group + '_aws' cmd = f'cd scripts/terraform/ && sudo terraform workspace select {workspace}_{group}_aws'
output, stderr = funct.subprocess_execute(cmd) output, stderr = funct.subprocess_execute(cmd)
except Exception as e: except Exception as e:
print('error: ' + str(e)) print('error: ' + str(e))

11
inc/script.js
View File

@ -1457,23 +1457,22 @@ function returnNiceCheckingConfig(data) {
} }
alerts.forEach((element) => { alerts.forEach((element) => {
if (element.indexOf('error: ') != '-1' || element.indexOf('Fatal') != '-1' || element.indexOf('Error') != '-1' || element.indexOf('failed ') != '-1' || element.indexOf('emerg] ') != '-1' || element.indexOf('Syntax error ') != '-1') { if (element.indexOf('error: ') != '-1' || element.indexOf('Fatal') != '-1' || element.indexOf('Error') != '-1' || element.indexOf('failed ') != '-1' || element.indexOf('emerg] ') != '-1' || element.indexOf('Syntax error ') != '-1') {
alert_error = alert_error + element alert_error = alert_error + element;
return return
} }
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) { if (second_alert == false) {
alert_warning = alert_warning + element; alert_warning = alert_warning + element;
} else { } else {
alert_warning2 = alert_warning2 + element; alert_warning2 = alert_warning2 + element;
server_name = 'Master server:' server_name = 'Master server:';
server_name2 = 'Slave server:' server_name2 = 'Slave server:';
} }
} }
if (second_alert && output.length > 4 && output[1].indexOf('[NOTICE]') == '-1') { if (second_alert && output.length > 4 && output[1].indexOf('[NOTICE]') == '-1') {
server_name = 'Master server:' server_name = 'Master server:';
server_name2 = 'Slave server:' server_name2 = 'Slave server:';
} }
if (element.length === 0) { if (element.length === 0) {
second_alert = true; second_alert = true;