From b80b98c2b2734ac49516d3b1dc3f2fb54e3544e2 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Tue, 12 Nov 2019 00:59:09 +0300 Subject: [PATCH] v3.7.3 --- app/hapservers.py | 13 +++++++++++++ app/templates/base.html | 2 +- app/templates/hapservers.html | 17 +++++++++++++++++ app/versions.py | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/app/hapservers.py b/app/hapservers.py index 73a2f250..6f4f8676 100644 --- a/app/hapservers.py +++ b/app/hapservers.py @@ -27,6 +27,7 @@ serv = form.getvalue('serv') if serv: servers = sql.select_servers(server=serv) autorefresh = 1 + hap_configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir') else: servers = sql.get_dick_permit() autorefresh = 0 @@ -56,6 +57,18 @@ for s in servers: except: servers_with_status.append('Cannot get last date') + if serv: + try: + sections = funct.get_sections(hap_configs_dir +funct.get_files()[0]) + except: + try: + cfg = hap_configs_dir + s[2] + "-" + funct.get_data('config') + ".cfg" + error = funct.get_config(s[2], cfg) + sections = funct.get_sections(cfg) + except: + pass + servers_with_status.append(sections) + servers_with_status1.append(servers_with_status) diff --git a/app/templates/base.html b/app/templates/base.html index 23fd1bfb..57bae854 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -235,7 +235,7 @@ {% 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 %} diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html index d8a57977..16239139 100644 --- a/app/templates/hapservers.html +++ b/app/templates/hapservers.html @@ -90,7 +90,24 @@ {% endif %} +
+ {% if serv %} + {% if s.8 is defined %} +
+
+ Backends: +
+
+ {% for b in s.8 %} + + {{b}} + + {% endfor %} +
+
+ {% endif %} + {% endif %} {% endfor %} diff --git a/app/versions.py b/app/versions.py index 21ed45be..7bce230e 100644 --- a/app/versions.py +++ b/app/versions.py @@ -42,7 +42,7 @@ if serv is not None and form.getvalue('del') is not None: try: os.remove(os.path.join(hap_configs_dir, form.getvalue(get))) file.add(form.getvalue(get) + "
") - funct.logging(serv, "versions.py deleted config: %s" % form.getvalue(get)) + funct.logging(serv, "versions.py were deleted configs: %s" % form.getvalue(get)) except OSError as e: stderr = "Error: %s - %s." % (e.filename,e.strerror) print('' % form.getvalue('serv'))