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-29 19:27:17 +03:00
parent 7f408822a4
commit 0ff26682be
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/funct.py
View File

@ -350,7 +350,7 @@ def return_ssh_keys_path(server_ip: str, **kwargs) -> dict:
ssh_settings.setdefault('enabled', ssh.enable) ssh_settings.setdefault('enabled', ssh.enable)
ssh_settings.setdefault('user', ssh.username) ssh_settings.setdefault('user', ssh.username)
ssh_settings.setdefault('password', ssh.password) ssh_settings.setdefault('password', ssh.password)
ssh_key = f'{lib_path}/keys/{ssh.name}.pem' if ssh.enable == '1' else '' ssh_key = f'{lib_path}/keys/{ssh.name}.pem' if ssh.enable == 1 else ''
ssh_settings.setdefault('key', ssh_key) ssh_settings.setdefault('key', ssh_key)
ssh_port = [str(server[10]) for server in sql.select_servers(server=server_ip)] ssh_port = [str(server[10]) for server in sql.select_servers(server=server_ip)]

4
app/options.py
View File

@ -150,7 +150,7 @@ if form.getvalue('ipbackend') is not None and form.getvalue('backend_server') is
backend = funct.checkAjaxInput(form.getvalue('ipbackend')) backend = funct.checkAjaxInput(form.getvalue('ipbackend'))
backend_server = funct.checkAjaxInput(form.getvalue('backend_server')) backend_server = funct.checkAjaxInput(form.getvalue('backend_server'))
cmd = 'echo "show servers state"|nc %s %s |grep "%s" |grep "%s" |awk \'{print $5":"$19}\' |head -1' % ( cmd = 'echo "show servers state"|nc %s %s |grep "%s" |grep "%s" |awk \'{print $5":"$19}\' |head -1' % (
serv, haproxy_sock_port, backend, backend_server) serv, haproxy_sock_port, backend, backend_server)
output, stderr = funct.subprocess_execute(cmd) output, stderr = funct.subprocess_execute(cmd)
print(output[0]) print(output[0])
@ -848,7 +848,7 @@ if act == "overviewServers":
async def async_get_overviewServers(serv1, serv2, service): async def async_get_overviewServers(serv1, serv2, service):
if service == 'haproxy': if service == 'haproxy':
cmd = 'echo "show info" |nc %s %s -w 1|grep -e "node\|Nbproc\|Maxco\|MB\|Nbthread"' % ( cmd = 'echo "show info" |nc %s %s -w 1|grep -e "node\|Nbproc\|Maxco\|MB\|Nbthread"' % (
serv2, sql.get_setting('haproxy_sock_port')) serv2, sql.get_setting('haproxy_sock_port'))
out = funct.subprocess_execute(cmd) out = funct.subprocess_execute(cmd)
return_out = "" return_out = ""