From d935377f4105d53c43065cbef0c51216abf13cb8 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Sat, 4 Sep 2021 18:59:18 +0600 Subject: [PATCH] v5.2.5.0 Changelog: https://haproxy-wi.org/changelog.py#5_2_5 --- app/funct.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/funct.py b/app/funct.py index 91b1c242..4e9ca33b 100644 --- a/app/funct.py +++ b/app/funct.py @@ -92,6 +92,7 @@ def get_data(log_type, **kwargs): def get_user_group(**kwargs): import sql import http.cookies + user_group = '' try: cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) @@ -855,7 +856,7 @@ def upload_and_restart(server_ip, cfg, **kwargs): else: commands = [check_and_move + " && sudo systemctl restart nginx"] 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: haproxy_enterprise = sql.get_setting('haproxy_enterprise') @@ -876,7 +877,7 @@ def upload_and_restart(server_ip, cfg, **kwargs): else: commands = [check_config + move_config + " && sudo systemctl restart "+haproxy_service_name+""] 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')) 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') date = hour+':'+minut date1 = hour1+':'+minut1 + cmd = '' if grep is not None: grep_act = '|egrep "%s"' % grep