From 19abee39ce75a5a3d65fc45915023488af95f07b Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Thu, 23 Jan 2020 08:55:12 +0300
Subject: [PATCH] v3.12.2.1

Changelog: https://haproxy-wi.org/changelog.py#3_12_2_1
---
 app/create_db.py              | 2 +-
 app/hapservers.py             | 1 +
 app/sql.py                    | 2 +-
 app/templates/hapservers.html | 3 +++
 inc/overview.js               | 2 +-
 inc/waf.js                    | 6 +++---
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/create_db.py b/app/create_db.py
index 657e8b16..de434ad0 100644
--- a/app/create_db.py
+++ b/app/create_db.py
@@ -362,7 +362,7 @@ def update_db_v_3_12_1(**kwargs):
 	
 def update_ver(**kwargs):
 	con, cur = get_cur()
-	sql = """update version set version = '3.12.2.0'; """
+	sql = """update version set version = '3.12.2.1'; """
 	try:    
 		cur.execute(sql)
 		con.commit()
diff --git a/app/hapservers.py b/app/hapservers.py
index 17bcc8c7..64364d3a 100644
--- a/app/hapservers.py
+++ b/app/hapservers.py
@@ -49,6 +49,7 @@ for s in servers:
 			out1 = False
 		servers_with_status.append(out1)
 	servers_with_status.append(s[12])
+	servers_with_status.append(sql.is_master(s[2]))
 	
 	servers_with_status1.append(servers_with_status)
 	
diff --git a/app/sql.py b/app/sql.py
index b3a72524..4b3be506 100644
--- a/app/sql.py
+++ b/app/sql.py
@@ -552,7 +552,7 @@ def get_dick_permit(**kwargs):
 	
 def is_master(ip, **kwargs):
 	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'):
 		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:
diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html
index 2aec0e77..cf962b2b 100644
--- a/app/templates/hapservers.html
+++ b/app/templates/hapservers.html
@@ -96,6 +96,9 @@
 				</span>			
 				<br />
 				IP: {{s.2}}
+				{% if s.7.0.0 != None %}
+					Master for: {{ s.7.0.1 }}
+				{% endif %}
 			</div>
 			<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>	
diff --git a/inc/overview.js b/inc/overview.js
index 366cb3a2..56d3ffa8 100644
--- a/inc/overview.js
+++ b/inc/overview.js
@@ -153,7 +153,7 @@ function ajaxActionWafServers(action, id) {
 					if( data ==  'Bad config, check please ' ) {
 						alert(data);
 					} else {
-						setTimeout(showOverviewWaf, 2000)						
+						setTimeout(showOverviewWaf(ip, hostnamea), 2000)						
 					}
 				},
 				error: function(){
diff --git a/inc/waf.js b/inc/waf.js
index 64463317..6080eef7 100644
--- a/inc/waf.js
+++ b/inc/waf.js
@@ -7,7 +7,6 @@ $( function() {
 function showOverviewWaf(serv, hostnamea) {
 	$.getScript('/inc/chart.min.js');
 	showWafMetrics();
-	console.log(serv)
 	var i;
 	for (i = 0; i < serv.length; i++) { 
 		showOverviewWafCallBack(serv[i], hostnamea[i])
@@ -32,6 +31,7 @@ function showOverviewWafCallBack(serv, hostnamea) {
 			$("#"+hostnamea).html(data)		
 			$( "input[type=submit], button" ).button();
 			$( "input[type=checkbox]" ).checkboxradio();
+			$.getScript('/inc/overview.js');
 		}				
 	} );
 }
@@ -49,7 +49,7 @@ function metrics_waf(name) {
 		},
 		type: "POST",
 		success: function( data ) {
-			showOverviewWaf();
+			showOverviewWaf(ip, hostnamea);
 			setTimeout(function() {
 				$( "#"+name ).parent().parent().removeClass( "update" );
 			}, 2500 );
@@ -82,7 +82,7 @@ function installWaf(ip) {
 				$('.alert-danger').remove();
 				$('.alert-warning').remove();
 				$("#ajax").html('<div class="alert alert-success">'+data+'</data>');
-				showOverviewWaf()
+				showOverviewWaf(ip, hostnamea)
 			}	
 		}
 	} );