From 3c8ab621fd768cf33f78cca486f921220d57025a Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Mon, 18 Jan 2021 22:21:51 +0600 Subject: [PATCH] v4.5.8.0 Changelog: https://haproxy-wi.org/changelog.py#4_5_8 --- app/add.py | 1 - app/config.py | 2 - app/ha.py | 18 +++--- app/hapservers.py | 1 - app/logs.py | 42 ++++++-------- app/metrics.py | 1 - app/overview.py | 1 - app/runtimeapi.py | 19 +++--- app/sections.py | 1 - app/servers.py | 1 - app/smon.py | 1 - app/templates/ajax/check_version.html | 17 ++++++ app/templates/base.html | 73 +++++------------------- app/templates/include/admin_servers.html | 2 +- app/templates/include/input_macros.html | 2 +- app/users.py | 6 +- app/versions.py | 35 ++++++------ app/viewlogs.py | 9 +-- app/viewsttats.py | 30 +++++----- app/waf.py | 40 +++++++++---- inc/script.js | 11 ++++ inc/style.css | 6 +- 22 files changed, 156 insertions(+), 163 deletions(-) create mode 100644 app/templates/ajax/check_version.html diff --git a/app/add.py b/app/add.py index b5a57aff..dae34fb9 100644 --- a/app/add.py +++ b/app/add.py @@ -46,7 +46,6 @@ if form.getvalue('mode') is None and form.getvalue('new_userlist') is None: add=form.getvalue('add'), conf_add=form.getvalue('conf'), group=user_group, - versions=funct.versions(), options=sql.select_options(), saved_servers=sql.select_saved_servers(), white_lists=white_lists, diff --git a/app/config.py b/app/config.py index be21f3eb..16d27a13 100644 --- a/app/config.py +++ b/app/config.py @@ -125,8 +125,6 @@ template = template.render(h2=1, title=title, selects=servers, stderr=stderr, error=error, - note=1, - versions=funct.versions(), service=service, token=token) print(template) diff --git a/app/ha.py b/app/ha.py index f02bd3ca..419e1c21 100644 --- a/app/ha.py +++ b/app/ha.py @@ -6,22 +6,22 @@ template = env.get_template('ha.html') print('Content-type: text/html\n') funct.check_login() -funct.page_for_admin(level = 2) +funct.page_for_admin(level=2) form = funct.form serv = form.getvalue('serv') try: user, user_id, role, token, servers = funct.get_users_params() -except: +except Exception: pass -output_from_parsed_template = template.render(h2 = 1, title = "Create and configure HA cluster", - role = role, - user = user, - serv = serv, - selects = servers, - versions = funct.versions(), - token = token) +output_from_parsed_template = template.render(h2=1, + title="Create and configure HA cluster", + role=role, + user=user, + serv=serv, + selects=servers, + token=token) print(output_from_parsed_template) diff --git a/app/hapservers.py b/app/hapservers.py index c1591804..193e6d7c 100644 --- a/app/hapservers.py +++ b/app/hapservers.py @@ -104,7 +104,6 @@ template = template.render(h2=1, users=users, groups=groups, servers=servers_with_status1, - versions=funct.versions(), keep_alive=''.join(keep_alive), serv=serv, service=service, diff --git a/app/logs.py b/app/logs.py index 5ba452a9..a484c10d 100644 --- a/app/logs.py +++ b/app/logs.py @@ -33,7 +33,7 @@ funct.check_login() try: user, user_id, role, token, servers = funct.get_users_params() -except: +except Exception: pass if service == 'nginx': @@ -41,26 +41,22 @@ if service == 'nginx': else: title = "HAProxy`s logs" -template = template.render(h2 = 1, - autorefresh = 1, - title = title, - role = role, - user = user, - select_id = "serv", - selects = servers, - serv = form.getvalue('serv'), - rows = rows, - grep = grep, - exgrep = exgrep, - hour = hour, - hour1 = hour1, - minut = minut, - minut1 = minut1, - waf = waf, - versions = funct.versions(), - service = service, - token = token) +template = template.render(h2=1, + autorefresh=1, + title=title, + role=role, + user=user, + select_id="serv", + selects=servers, + serv=form.getvalue('serv'), + rows=rows, + grep=grep, + exgrep=exgrep, + hour=hour, + hour1=hour1, + minut=minut, + minut1=minut1, + waf=waf, + service=service, + token=token) print(template) - - - diff --git a/app/metrics.py b/app/metrics.py index 61ebcc9e..27889cc4 100644 --- a/app/metrics.py +++ b/app/metrics.py @@ -29,7 +29,6 @@ template = template.render(h2=1, title="Metrics", role=role, user=user, servers=servers, - versions=funct.versions(), services=services, token=token) print(template) diff --git a/app/overview.py b/app/overview.py index 3503ef37..d3eb74ca 100644 --- a/app/overview.py +++ b/app/overview.py @@ -126,7 +126,6 @@ template = template.render(h2=1, checker_error_log_id=funct.haproxy_wi_log(log_id=1, file="checker-error"), metrics_error_log_id=funct.haproxy_wi_log(log_id=1, file="metrics-error"), error=stderr, - versions=funct.versions(), haproxy_wi_log=funct.haproxy_wi_log(), servers=servers, is_checker_worker=is_checker_worker, diff --git a/app/runtimeapi.py b/app/runtimeapi.py index cb82c198..98cf06e5 100644 --- a/app/runtimeapi.py +++ b/app/runtimeapi.py @@ -14,17 +14,16 @@ try: serv = form.getvalue('serv') if servbackend is None: servbackend = "" -except: +except Exception: pass -template = template.render(h2 = 0, - title = "RunTime API", - role = role, - user = user, - select_id = "serv", - selects = servers, - token = token, - versions = funct.versions(), - servbackend = servbackend) +template = template.render(h2=0, + title="RunTime API", + role=role, + user=user, + select_id="serv", + selects=servers, + token=token, + servbackend=servbackend) print(template) diff --git a/app/sections.py b/app/sections.py index 7402823a..f4b7bbc5 100644 --- a/app/sections.py +++ b/app/sections.py @@ -87,6 +87,5 @@ template = template.render(h2=1, title="Working with HAProxy configs", end_line=end_line, section=section, sections=sections, - versions=funct.versions(), token=token) print(template) diff --git a/app/servers.py b/app/servers.py index 279c808b..b51265fa 100644 --- a/app/servers.py +++ b/app/servers.py @@ -50,7 +50,6 @@ output_from_parsed_template = template.render(title="Servers: ", sshs=sql.select_ssh(group=user_group), telegrams=sql.get_user_telegram_by_group(user_group), token=token, - versions=funct.versions(), settings=settings, backups=sql.select_backups(), grafana=''.join(grafana), diff --git a/app/smon.py b/app/smon.py index a02a718c..25ac1e33 100644 --- a/app/smon.py +++ b/app/smon.py @@ -46,7 +46,6 @@ template = template.render(h2=1, title=title, user=user, group=user_group, telegrams=sql.get_user_telegram_by_group(user_group), - versions=funct.versions(), smon=smon, smon_status=smon_status, smon_error=stderr, diff --git a/app/templates/ajax/check_version.html b/app/templates/ajax/check_version.html new file mode 100644 index 00000000..47c676f0 --- /dev/null +++ b/app/templates/ajax/check_version.html @@ -0,0 +1,17 @@ +{% if versions is defined %} + {% set current_ver = versions.0 %} + {% set new_ver = versions.1 %} + {% set current_ver_without_dots = versions.2 %} + {% set new_ver_without_dots = versions.3 %} +{% endif %} +{% if new_ver_without_dots is defined and current_ver_without_dots is defined and new_ver is defined and new_ver_without_dots is defined %} + + {% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %} + v{{current_ver}} + {% else %} + v{{current_ver}} + {% endif %} + +{% else %} + v{{current_ver}} +{% endif %} \ No newline at end of file diff --git a/app/templates/base.html b/app/templates/base.html index f724bf96..f8272086 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -26,11 +26,9 @@ - + @@ -175,50 +173,26 @@
@@ -256,26 +230,7 @@ -
- {% if versions is defined %} - {% set current_ver = versions.0 %} - {% set new_ver = versions.1 %} - {% set current_ver_without_dots = versions.2 %} - {% set new_ver_without_dots = versions.3 %} - {% endif %} - {% if new_ver_without_dots is defined and current_ver_without_dots is defined and new_ver is defined and new_ver_without_dots is defined %} - - {% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %} - v{{current_ver}} - {% else %} - v{{current_ver}} - {% endif %} - - {% else %} - v{{current_ver}} - {% endif %} -
-
+