diff --git a/app/create_db.py b/app/create_db.py index 16875ba5..5b364daa 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -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() diff --git a/app/funct.py b/app/funct.py index ed83fbf5..d4158ac4 100644 --- a/app/funct.py +++ b/app/funct.py @@ -651,7 +651,6 @@ def ssh_command(serv, commands, **kwargs): try: ssh.close() except: - print("
"+str(ssh)+"X
") logging('localhost', ' '+str(ssh), haproxywi=1) pass diff --git a/app/overview.py b/app/overview.py index c0adb822..197ecf5d 100644 --- a/app/overview.py +++ b/app/overview.py @@ -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, diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html index 602064ee..f4e76987 100644 --- a/app/templates/hapservers.html +++ b/app/templates/hapservers.html @@ -70,10 +70,14 @@ {% endif %}
- {% 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 %}