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

v3.4.9

pull/145/head
Pavel Loginov 2019-09-22 20:41:01 +03:00
parent d52a94ed99
commit 99f4c747fd
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/hapservers.py
View File

@ -27,7 +27,7 @@ out1 = ""
for s in servers: for s in servers:
# print(s[2]) # print(s[2])
servers_with_status = list() servers_with_status = list()
cmd = 'echo "show info" |nc %s %s -w 1 |grep -e "Ver\|Uptime:"' % (s[2], haproxy_sock_port) cmd = 'echo "show info" |nc %s %s -w 1 |grep -e "Ver\|Uptime:\|Process_num"' % (s[2], haproxy_sock_port)
# print(cmd ) # print(cmd )
out = funct.subprocess_execute(cmd) out = funct.subprocess_execute(cmd)
servers_with_status.append(s[0]) servers_with_status.append(s[0])

8
app/templates/hapservers.html
View File

@ -6,11 +6,13 @@
<div class="server-name"> <div class="server-name">
{% if s.5 != False %} {% if s.5 != False %}
<span class="serverUp server-status" title="{{s.5.0.0}} {{s.5.0.1}}"></span> <span class="serverUp server-status" title="{{s.5.0.2}}"></span>
{% else %} {% else %}
<span class="serverDown server-status" title="HAProxy is down"></span> <span class="serverDown server-status" title="HAProxy is down"></span>
{% endif %} {% endif %}
<span title="Show info about {{s.2}}" onclick="showOverviewServer('{{s.1}}', '{{s.2}}', '{{s.0}}')" style="cursor: pointer;">{{s.1}}</span> <span title="Show info about {{s.2}}" onclick="showOverviewServer('{{s.1}}', '{{s.2}}', '{{s.0}}')" style="cursor: pointer;">
{{s.1}}
</span>
{% if role <= 1 %} {% if role <= 1 %}
<span class="server-action"> <span class="server-action">
<a id="{{ s.2 }}" class="start" title="Start HAProxy service"> <a id="{{ s.2 }}" class="start" title="Start HAProxy service">
@ -27,6 +29,8 @@
</div> </div>
<div class="server-desc"> <div class="server-desc">
{{s.3}} {{s.3}}
<br />
{{s.5.0.0}} {{s.5.0.1}}
</div> </div>
<div class="server-act-links"> <div class="server-act-links">
<a href="/app/config.py?serv={{s.2}}&showConfig" class="ui-button ui-widget ui-corner-all" title="Open running config" target="_blank">Open</a> <a href="/app/config.py?serv={{s.2}}&showConfig" class="ui-button ui-widget ui-corner-all" title="Open running config" target="_blank">Open</a>

6
inc/style.css
View File

@ -402,7 +402,7 @@ pre {
} }
.first-collumn { .first-collumn {
padding-left: 15px; padding-left: 15px;
width: 15%; width: 20%;
} }
.second-collumn { .second-collumn {
width: 20%; width: 20%;
@ -789,13 +789,13 @@ label {
margin-top: px; margin-top: px;
margin-bottom: 0px; margin-bottom: 0px;
margin-top: 14px; margin-top: 14px;
height: 11em; height: 12.3em;
} }
.haproxy-info { .haproxy-info {
display: inline-block; display: inline-block;
width: 160px; width: 160px;
padding-left: 20px; padding-left: 20px;
padding-top: 1.1em; padding-top: 2em;
font-size: 0.88em; font-size: 0.88em;
} }
.top-info { .top-info {