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

v3.12.2.1 

Changelog: https://haproxy-wi.org/changelog.py#3_12_2_1
pull/205/head
Pavel Loginov 2020-01-23 08:55:12 +03:00
parent 90e0fa7bb9
commit 19abee39ce
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/create_db.py
View File

@ -362,7 +362,7 @@ def update_db_v_3_12_1(**kwargs):
def update_ver(**kwargs): def update_ver(**kwargs):
con, cur = get_cur() con, cur = get_cur()
sql = """update version set version = '3.12.2.0'; """ sql = """update version set version = '3.12.2.1'; """
try: try:
cur.execute(sql) cur.execute(sql)
con.commit() con.commit()

1
app/hapservers.py
View File

@ -49,6 +49,7 @@ for s in servers:
out1 = False out1 = False
servers_with_status.append(out1) servers_with_status.append(out1)
servers_with_status.append(s[12]) servers_with_status.append(s[12])
servers_with_status.append(sql.is_master(s[2]))
servers_with_status1.append(servers_with_status) servers_with_status1.append(servers_with_status)

2
app/sql.py
View File

@ -552,7 +552,7 @@ def get_dick_permit(**kwargs):
def is_master(ip, **kwargs): def is_master(ip, **kwargs):
con, cur = get_cur() con, cur = get_cur()
sql = """ select slave.ip from servers as master left join servers as slave on master.id = slave.master where master.ip = '%s' """ % ip sql = """ select slave.ip, slave.hostname from servers as master left join servers as slave on master.id = slave.master where master.ip = '%s' """ % ip
if kwargs.get('master_slave'): if kwargs.get('master_slave'):
sql = """ select master.hostname, master.ip, slave.hostname, slave.ip from servers as master left join servers as slave on master.id = slave.master where slave.master > 0 """ sql = """ select master.hostname, master.ip, slave.hostname, slave.ip from servers as master left join servers as slave on master.id = slave.master where slave.master > 0 """
try: try:

3
app/templates/hapservers.html
View File

@ -96,6 +96,9 @@
</span> </span>
<br /> <br />
IP: {{s.2}} IP: {{s.2}}
{% if s.7.0.0 != None %}
Master for: {{ s.7.0.1 }}
{% endif %}
</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">Open</a> <a href="/app/config.py?serv={{s.2}}&showConfig" class="ui-button ui-widget ui-corner-all" title="Open running config">Open</a>

2
inc/overview.js
View File

@ -153,7 +153,7 @@ function ajaxActionWafServers(action, id) {
if( data == 'Bad config, check please ' ) { if( data == 'Bad config, check please ' ) {
alert(data); alert(data);
} else { } else {
setTimeout(showOverviewWaf, 2000) setTimeout(showOverviewWaf(ip, hostnamea), 2000)
} }
}, },
error: function(){ error: function(){

6
inc/waf.js
View File

@ -7,7 +7,6 @@ $( function() {
function showOverviewWaf(serv, hostnamea) { function showOverviewWaf(serv, hostnamea) {
$.getScript('/inc/chart.min.js'); $.getScript('/inc/chart.min.js');
showWafMetrics(); showWafMetrics();
console.log(serv)
var i; var i;
for (i = 0; i < serv.length; i++) { for (i = 0; i < serv.length; i++) {
showOverviewWafCallBack(serv[i], hostnamea[i]) showOverviewWafCallBack(serv[i], hostnamea[i])
@ -32,6 +31,7 @@ function showOverviewWafCallBack(serv, hostnamea) {
$("#"+hostnamea).html(data) $("#"+hostnamea).html(data)
$( "input[type=submit], button" ).button(); $( "input[type=submit], button" ).button();
$( "input[type=checkbox]" ).checkboxradio(); $( "input[type=checkbox]" ).checkboxradio();
$.getScript('/inc/overview.js');
} }
} ); } );
} }
@ -49,7 +49,7 @@ function metrics_waf(name) {
}, },
type: "POST", type: "POST",
success: function( data ) { success: function( data ) {
showOverviewWaf(); showOverviewWaf(ip, hostnamea);
setTimeout(function() { setTimeout(function() {
$( "#"+name ).parent().parent().removeClass( "update" ); $( "#"+name ).parent().parent().removeClass( "update" );
}, 2500 ); }, 2500 );
@ -82,7 +82,7 @@ function installWaf(ip) {
$('.alert-danger').remove(); $('.alert-danger').remove();
$('.alert-warning').remove(); $('.alert-warning').remove();
$("#ajax").html('<div class="alert alert-success">'+data+'</data>'); $("#ajax").html('<div class="alert alert-success">'+data+'</data>');
showOverviewWaf() showOverviewWaf(ip, hostnamea)
} }
} }
} ); } );