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

v5.2.5.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2_5
pull/304/head
Pavel Loginov 2021-09-04 18:59:18 +06:00
parent 4113fe67be
commit d935377f41
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/funct.py
View File

@ -92,6 +92,7 @@ def get_data(log_type, **kwargs):
def get_user_group(**kwargs): def get_user_group(**kwargs):
import sql import sql
import http.cookies import http.cookies
user_group = ''
try: try:
cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
@ -855,7 +856,7 @@ def upload_and_restart(server_ip, cfg, **kwargs):
else: else:
commands = [check_and_move + " && sudo systemctl restart nginx"] commands = [check_and_move + " && sudo systemctl restart nginx"]
if sql.return_firewall(server_ip): if sql.return_firewall(server_ip):
commands[0] += open_port_firewalld(cfg, serv=server_ip, service='nginx') commands[0] += open_port_firewalld(cfg, server_ip=server_ip, service='nginx')
else: else:
haproxy_enterprise = sql.get_setting('haproxy_enterprise') haproxy_enterprise = sql.get_setting('haproxy_enterprise')
@ -876,7 +877,7 @@ def upload_and_restart(server_ip, cfg, **kwargs):
else: else:
commands = [check_config + move_config + " && sudo systemctl restart "+haproxy_service_name+""] commands = [check_config + move_config + " && sudo systemctl restart "+haproxy_service_name+""]
if sql.return_firewall(server_ip): if sql.return_firewall(server_ip):
commands[0] += open_port_firewalld(cfg, serv=server_ip) commands[0] += open_port_firewalld(cfg, server_ip=server_ip)
error += str(upload(server_ip, tmp_file, cfg, dir='fullpath')) error += str(upload(server_ip, tmp_file, cfg, dir='fullpath'))
try: try:
@ -989,6 +990,7 @@ def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', h
exgrep = form.getvalue('exgrep') exgrep = form.getvalue('exgrep')
date = hour+':'+minut date = hour+':'+minut
date1 = hour1+':'+minut1 date1 = hour1+':'+minut1
cmd = ''
if grep is not None: if grep is not None:
grep_act = '|egrep "%s"' % grep grep_act = '|egrep "%s"' % grep