From b05828536a7320bedc6659f679bda7f6e8800196 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Tue, 5 Oct 2021 11:52:55 +0600 Subject: [PATCH] v5.3.0.0 Changelog: https://haproxy-wi.org/changelog.py#5_3 --- app/funct.py | 2 +- app/metrics.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/funct.py b/app/funct.py index 4dafec59..2713e0ff 100644 --- a/app/funct.py +++ b/app/funct.py @@ -930,7 +930,7 @@ def upload_and_restart(server_ip, cfg, **kwargs): if haproxy_enterprise == '1': haproxy_service_name = "hapee-2.0-lb" - check_config = "sudo " + haproxy_service_name + " haproxy -q -c -f " + tmp_file + check_config = "sudo " + haproxy_service_name + " -q -c -f " + tmp_file move_config = " && sudo mv -f " + tmp_file + " " + config_path if action == "test": diff --git a/app/metrics.py b/app/metrics.py index 3ba69fc3..9b5317d8 100644 --- a/app/metrics.py +++ b/app/metrics.py @@ -7,6 +7,7 @@ env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) template = env.get_template('metrics.html') form = funct.form service = form.getvalue('service') +title = 'Metrics service' funct.check_login() print('Content-type: text/html\n') @@ -23,7 +24,6 @@ try: if not stderr: if service_ver[0] == '* is not installed' or service_ver == '': servers = '' - title = 'Metrics service' else: if service == 'nginx': if funct.check_login(service=2):