From 36960cfc5fd1519b344c86512c65e1e06d72c518 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Mon, 27 Jan 2020 21:12:59 +0300
Subject: [PATCH] v3.12.2.2

Change log: https://haproxy-wi.org/changelog.py#3_12_2_2
---
 app/sql.py | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/sql.py b/app/sql.py
index 25777444..f2dde459 100644
--- a/app/sql.py
+++ b/app/sql.py
@@ -445,9 +445,8 @@ def get_user_name_by_uuid(uuid):
 	
 def get_user_role_by_uuid(uuid):
 	con, cur = get_cur()
-	sql = """ select role.id from user left join uuid as uuid on user.id = uuid.user_id left join role on role.name = user.role where uuid.uuid = '%s' """ % uuid
 	try:
-		cur.execute(sql)		
+		cur.execute("select role.id from user left join uuid as uuid on user.id = uuid.user_id left join role on role.name = user.role where uuid.uuid = '%s'" % uuid)		
 	except sqltool.Error as e:
 		out_error(e)
 	else:
@@ -1450,6 +1449,7 @@ def select_alert(**kwargs):
 	cur.close()    
 	con.close() 
 	
+	
 def select_keep_alive(**kwargs):
 	con, cur = get_cur()
 	sql = """select ip from servers where active = 1 """
@@ -1463,6 +1463,35 @@ def select_keep_alive(**kwargs):
 	con.close() 
 	
 	
+def select_keealived(serv, **kwargs):
+	con, cur = get_cur()
+	sql = """select keepalived from `servers` where ip='%s' """ % serv
+	try:    
+		cur.execute(sql)
+	except sqltool.Error as e:
+		out_error(e)
+	else:
+		for value in cur.fetchone():
+			return value
+	cur.close()    
+	con.close()  
+	
+	
+def update_keepalived(serv):
+	con, cur = get_cur()
+	sql = """update `servers` set `keepalived` = '1' where ip = '%s' """ % serv
+	try:    
+		cur.execute(sql)
+		con.commit()
+		return True
+	except sqltool.Error as e:
+		out_error(e)
+		con.rollback()
+		return False
+	cur.close()    
+	con.close()
+	
+	
 def check_token_exists(token):
 	try:
 		import http.cookies