pull/194/head
Pavel Loginov 2019-12-23 17:46:56 +03:00
parent 0072b1babf
commit 4f90857e21
4 changed files with 10 additions and 6 deletions

View File

@ -459,7 +459,7 @@ def update_db_v_3_8_1(**kwargs):
def update_ver(**kwargs):
con, cur = get_cur()
sql = """update version set version = '3.9.3'; """
sql = """update version set version = '3.9.4'; """
try:
cur.execute(sql)
con.commit()

View File

@ -651,7 +651,6 @@ def ssh_command(serv, commands, **kwargs):
try:
ssh.close()
except:
print("<div class='alert alert-danger' style='margin: 0;'>"+str(ssh)+"<a title='Close' id='errorMess'><b>X</b></a></div>")
logging('localhost', ' '+str(ssh), haproxywi=1)
pass

View File

@ -20,6 +20,7 @@ try:
users = sql.select_users()
groups = sql.select_groups()
token = sql.get_token(user_id.value)
role = sql.get_user_role_by_uuid(user_id.value)
cmd = "ps ax |grep checker_mas |grep -v grep |wc -l"
checker_master, stderr = funct.subprocess_execute(cmd)
cmd = "ps ax |grep checker_worker |grep -v grep |wc -l"
@ -39,7 +40,7 @@ except:
template = template.render(h2 = 1,
autorefresh = 1,
title = "Overview",
role = sql.get_user_role_by_uuid(user_id.value),
role = role,
user = user,
users = users,
groups = groups,

View File

@ -70,10 +70,14 @@
{% endif %}
<br />
<span title="Date of last edit config">
{% if "ls: cannot access" in s.7 %}
Cannot find HAProxy config
{% if s.7 != None %}
{% if "ls: cannot access" in s.7 %}
Cannot find HAProxy config
{% else %}
Last edit: {{s.7}}
{% endif %}
{% else %}
Last edit: {{s.7}}
Cannot connect to HAProxy server
{% endif %}
</span>
<br />