From 46c2b58155f02761703ca6ee1214895cff5107e5 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Mon, 9 Nov 2020 20:15:26 +0600 Subject: [PATCH] v4.5.3.0 Changelog: https://haproxy-wi.org/changelog.py#4_5_3 --- app/users.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/app/users.py b/app/users.py index 22f66a21..4f36794b 100644 --- a/app/users.py +++ b/app/users.py @@ -38,16 +38,24 @@ try: service_ver, stderr = funct.subprocess_execute(cmd) services.append([s, status, v, service_ver[0]]) - openvpn, stderr = funct.subprocess_execute("rpm --query openvpn3-client") - if openvpn[0] != 'package openvpn3-client is not installed': - cmd = "sudo openvpn3 configs-list |grep -E 'ovpn|(^|[^0-9])[0-9]{4}($|[^0-9])' |grep -v net|awk -F\" \" '{print $1}'|awk 'ORS=NR%2?\" \":\"\\n\"'" - openvpn_configs, stderr = funct.subprocess_execute(cmd) - cmd = "sudo openvpn3 sessions-list|grep -E 'Config|Status'|awk -F\":\" '{print $2}'|awk 'ORS=NR%2?\" \":\"\\n\"'| sed 's/^ //g'" - openvpn_sess, stderr = funct.subprocess_execute(cmd) - else: + try: + stdout, stderr = funct.subprocess_execute("rpm --query openvpn3-client") + if stdout[0] != 'package openvpn3-client is not installed': + cmd = "sudo openvpn3 configs-list |grep -E 'ovpn|(^|[^0-9])[0-9]{4}($|[^0-9])' |grep -v net|awk -F\" \" '{print $1}'|awk 'ORS=NR%2?\" \":\"\\n\"'" + openvpn_configs, stderr = funct.subprocess_execute(cmd) + cmd = "sudo openvpn3 sessions-list|grep -E 'Config|Status'|awk -F\":\" '{print $2}'|awk 'ORS=NR%2?\" \":\"\\n\"'| sed 's/^ //g'" + openvpn_sess, stderr = funct.subprocess_execute(cmd) + openvpn = stdout[0] + else: + openvpn_configs = '' + openvpn_sess = '' + openvpn = '' + except Exception: openvpn_configs = '' openvpn_sess = '' -except: + openvpn = '' + +except Exception: pass @@ -67,7 +75,7 @@ template = template.render(title="Admin area: Manage users", smon_ver=funct.check_new_version(service='smon'), metrics_ver=funct.check_new_version(service='metrics'), keep_ver=funct.check_new_version(service='keep'), - openvpn=openvpn[0], + openvpn=openvpn, openvpn_configs=openvpn_configs, openvpn_sess=openvpn_sess, settings=settings,