github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v5.2.4.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2_4
pull/304/head
Pavel Loginov 2021-08-29 20:58:01 +06:00
parent 1cd69350fc
commit 7c5c2443c8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/funct.py
View File

@ -1327,6 +1327,7 @@ def check_service(serv, service_name):
def get_services_status(): def get_services_status():
import distro
services = [] services = []
services_name = {'roxy-wi-checker': 'Checker backends master service', services_name = {'roxy-wi-checker': 'Checker backends master service',
'roxy-wi-keep_alive': 'Auto start service', 'roxy-wi-keep_alive': 'Auto start service',
@ -1343,20 +1344,25 @@ def get_services_status():
service_name = s.split('_')[0] service_name = s.split('_')[0]
if s == 'grafana-server': if s == 'grafana-server':
service_name = 'grafana' service_name = 'grafana'
elif s == 'roxy-wi-keep_alive' and distro.id() == 'ubuntu':
service_name = 'roxy-wi-keep-alive'
else: else:
service_name = s service_name = s
if service_name == 'prometheus': if service_name == 'prometheus':
cmd = "prometheus --version 2>&1 |grep prometheus|awk '{print $3}'" cmd = "prometheus --version 2>&1 |grep prometheus|awk '{print $3}'"
else: else:
import distro
if distro.id() == 'ubuntu': if distro.id() == 'ubuntu':
cmd = "apt list --installed 2>&1 |grep " + service_name + "|awk '{print $2}'|sed 's/-/./'" cmd = "apt list --installed 2>&1 |grep " + service_name + "|awk '{print $2}'|sed 's/-/./'"
else: else:
cmd = "rpm -q " + service_name + "|awk -F\"" + service_name + "\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'" cmd = "rpm -q " + service_name + "|awk -F\"" + service_name + "\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'"
service_ver, stderr = subprocess_execute(cmd) service_ver, stderr = subprocess_execute(cmd)
if service_ver[0] == 'command': try:
service_ver[0] = '' if service_ver[0] == 'command':
service_ver[0] = ''
except Exception:
pass
try: try:
services.append([s, status, v, service_ver[0]]) services.append([s, status, v, service_ver[0]])