diff --git a/app/add.py b/app/add.py
index 02cd09a8..2d15ef43 100644
--- a/app/add.py
+++ b/app/add.py
@@ -396,17 +396,7 @@ if form.getvalue('generateconfig') is None and serv is not None:
funct.logging(serv, "add.py add new %s" % name)
- MASTERS = sql.is_master(serv)
- for master in MASTERS:
- if master[0] is not None:
- slave_output = funct.upload_and_restart(master[0], cfg)
-
- slave_output = '
' + master[1] + ':\n' + slave_output
-
- output = funct.upload_and_restart(serv, cfg, just_save="save")
-
- output = '
' + server_name + ':\n' + output
- output = output + slave_output
+ output = funct.master_slave_upload_and_restart(serv, cfg, just_save="save")
if output:
print(output)
else:
diff --git a/app/add_nginx.py b/app/add_nginx.py
index 82542016..2dafd077 100755
--- a/app/add_nginx.py
+++ b/app/add_nginx.py
@@ -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)
- MASTERS = sql.is_master(serv)
- 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)
+ output = funct.master_slave_upload_and_restart(serv, cfg, just_save="save", nginx=1, config_file_name=config_file_name)
- slave_output = '
' + master[1] + ':\n' + slave_output
-
- output = funct.upload_and_restart(serv, cfg, just_save="save", nginx=1, config_file_name=config_file_name)
-
- output = '
' + server_name + ':\n' + output
- output = output + slave_output
if output:
print(output)
else:
diff --git a/app/funct.py b/app/funct.py
index c3319479..a65a08da 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -393,9 +393,7 @@ def get_config(server_ip, cfg, **kwargs):
with ssh_connect(server_ip) as ssh:
ssh.get_sftp(config_path, cfg)
except Exception as e:
- print('error: cannot get config')
- logging('Roxy-WI server', str(e), roxywi=1)
- return
+ logging('Roxy-WI server', f'error: cannot get config: {e}', roxywi=1)
def diff_config(oldcfg, cfg, **kwargs):
@@ -962,7 +960,7 @@ def upload_and_restart(server_ip: str, cfg: str, **kwargs):
try:
get_config(server_ip, old_cfg, service=service, config_file_name=config_path)
except Exception:
- logging('Roxy-WI server', ' Cannot download config', roxywi=1)
+ logging('Roxy-WI server', 'Cannot download config for diff', roxywi=1)
try:
diff = diff_config(old_cfg, cfg, return_diff=1)
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):
import sql
- masters = sql.is_master(server_ip)
slave_output = ''
try:
@@ -1008,13 +1005,13 @@ def master_slave_upload_and_restart(server_ip, cfg, just_save, **kwargs):
else:
login = ''
- for master in masters:
- if master[0] is not None:
- slv_output = upload_and_restart(
- 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
- )
- slave_output += f'
{master[1]}:\n{slv_output}'
+ is_master = [masters[0] for masters in sql.is_master(server_ip)]
+ if is_master[0] is not None:
+ slv_output = upload_and_restart(
+ 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
+ )
+ slave_output += f'
slave_server:\n{slv_output}'
output = upload_and_restart(
server_ip, cfg, just_save=just_save, nginx=kwargs.get('nginx'), waf=kwargs.get('waf'),
diff --git a/app/options.py b/app/options.py
index c6285643..53c29c5e 100644
--- a/app/options.py
+++ b/app/options.py
@@ -3547,7 +3547,7 @@ if form.getvalue('awsvalidate') or form.getvalue('awseditvalidate'):
workspace = form.getvalue('awseditvalidate')
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)
if stderr != '':
print('error: ' + stderr)
@@ -3569,7 +3569,7 @@ if form.getvalue('awsworkspace'):
firewall = form.getvalue('aws_create_firewall')
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)
if stderr != '':
@@ -3623,7 +3623,7 @@ if form.getvalue('awseditworkspace'):
):
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)
except Exception as e:
print('error: ' + str(e))
diff --git a/inc/script.js b/inc/script.js
index 89c19371..f6c3e0ec 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -1457,23 +1457,22 @@ function returnNiceCheckingConfig(data) {
}
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') {
- alert_error = alert_error + element
+ alert_error = alert_error + element;
return
}
if (element.indexOf('[WARNING]') != '-1' || element.indexOf('[ALER]') != '-1' || element.indexOf('[warn]') != '-1') {
element = removeEmptyLines(element);
- console.log(element);
if (second_alert == false) {
alert_warning = alert_warning + element;
} else {
alert_warning2 = alert_warning2 + element;
- server_name = 'Master server:'
- server_name2 = 'Slave server:'
+ 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:'
+ server_name = 'Master server:';
+ server_name2 = 'Slave server:';
}
if (element.length === 0) {
second_alert = true;