mirror of https://github.com/Aidaho12/haproxy-wi
Fix missing Mysql 8 compatibility
Some areas with server management did not work with Mysql for v8 (Digital Ocean) I have resolved some issues with the queries for Mysqlpull/321/head
Tom Taylor
GitHub
parent
8d615e9a51
commit
352db60bd0
67
app/sql.py
67
app/sql.py
|
|
@ -386,12 +386,14 @@ def select_user_groups_with_names(user_id, **kwargs):
|
|||
if kwargs.get("all") is not None:
|
||||
query = (UserGroups
|
||||
.select(UserGroups.user_group_id, UserGroups.user_id, Groups.name)
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id)))
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id))
|
||||
)
|
||||
else:
|
||||
query = (UserGroups
|
||||
.select(UserGroups.user_group_id, Groups.name)
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id))
|
||||
.where(UserGroups.user_id == user_id))
|
||||
.where(UserGroups.user_id == user_id)
|
||||
)
|
||||
try:
|
||||
query_res = query.execute()
|
||||
except Exception as e:
|
||||
|
|
@ -490,14 +492,40 @@ def select_server_ip_by_id(server_id):
|
|||
|
||||
def select_servers(**kwargs):
|
||||
cursor = conn.cursor()
|
||||
sql = """select * from servers where enable = '1' ORDER BY groups """
|
||||
|
||||
if mysql_enable == '1':
|
||||
|
||||
sql = """select * from `servers` where `enable` = 1 ORDER BY servers.groups """
|
||||
|
||||
if kwargs.get("server") is not None:
|
||||
sql = """select * from `servers` where `ip` = '{}' """.format(kwargs.get("server"))
|
||||
if kwargs.get("full") is not None:
|
||||
sql = """select * from `servers` ORDER BY hostname """
|
||||
if kwargs.get("get_master_servers") is not None:
|
||||
sql = """select id,hostname from `servers` where `master` = 0 and type_ip = 0 and enable = 1 ORDER BY servers.groups """
|
||||
if kwargs.get("get_master_servers") is not None and kwargs.get('uuid') is not None:
|
||||
sql = """ select servers.id, servers.hostname from `servers`
|
||||
left join user as user on servers.groups = user.groups
|
||||
left join uuid as uuid on user.id = uuid.user_id
|
||||
where uuid.uuid = '{}' and servers.master = 0 and servers.type_ip = 0 and servers.enable = 1 ORDER BY servers.groups
|
||||
""".format(kwargs.get('uuid'))
|
||||
if kwargs.get("id"):
|
||||
sql = """select * from `servers` where `id` = '{}' """.format(kwargs.get("id"))
|
||||
if kwargs.get("hostname"):
|
||||
sql = """select * from `servers` where `hostname` = '{}' """.format(kwargs.get("hostname"))
|
||||
if kwargs.get("id_hostname"):
|
||||
sql = """select * from `servers` where `hostname` ='{}' or id = '{}' or ip = '{}'""".format(kwargs.get("id_hostname"), kwargs.get("id_hostname"), kwargs.get("id_hostname"))
|
||||
if kwargs.get("server") and kwargs.get("keep_alive"):
|
||||
sql = """select active from `servers` where `ip` = '{}' """.format(kwargs.get("server"))
|
||||
else:
|
||||
sql = """select * from servers where enable = '1' ORDER BY servers.groups """
|
||||
|
||||
if kwargs.get("server") is not None:
|
||||
sql = """select * from servers where ip = '{}' """.format(kwargs.get("server"))
|
||||
if kwargs.get("full") is not None:
|
||||
sql = """select * from servers ORDER BY hostname """
|
||||
if kwargs.get("get_master_servers") is not None:
|
||||
sql = """select id,hostname from servers where master = 0 and type_ip = 0 and enable = 1 ORDER BY groups """
|
||||
sql = """select id,hostname from servers where master = 0 and type_ip = 0 and enable = 1 ORDER BY servers.groups """
|
||||
if kwargs.get("get_master_servers") is not None and kwargs.get('uuid') is not None:
|
||||
sql = """ select servers.id, servers.hostname from servers
|
||||
left join user as user on servers.groups = user.groups
|
||||
|
|
@ -512,7 +540,9 @@ def select_servers(**kwargs):
|
|||
sql = """select * from servers where hostname = '{}' or id = '{}' or ip = '{}'""".format(kwargs.get("id_hostname"), kwargs.get("id_hostname"), kwargs.get("id_hostname"))
|
||||
if kwargs.get("server") and kwargs.get("keep_alive"):
|
||||
sql = """select active from servers where ip = '{}' """.format(kwargs.get("server"))
|
||||
|
||||
try:
|
||||
print(str(sql))
|
||||
cursor.execute(sql)
|
||||
except Exception as e:
|
||||
out_error(e)
|
||||
|
|
@ -802,22 +832,24 @@ def get_dick_permit(**kwargs):
|
|||
if funct.check_user_group(token=token):
|
||||
cursor = conn.cursor()
|
||||
try:
|
||||
if mysql_enable == '1':
|
||||
if grp == '1' and not only_group:
|
||||
sql = """ select * from servers where {} {} {} {} {} {} {} order by pos""" .format(disable,
|
||||
type_ip,
|
||||
nginx,
|
||||
haproxy,
|
||||
keepalived,
|
||||
apache,
|
||||
ip)
|
||||
sql = """ select * from `servers` order by `pos` desc"""
|
||||
else:
|
||||
sql = """ select * from `servers` where `groups` = {group} and ({disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} {apache} order by `pos` desc
|
||||
""".format(group=grp, disable=disable, type_ip=type_ip, ip=ip, haproxy=haproxy, nginx=nginx, keepalived=keepalived, apache=apache)
|
||||
else:
|
||||
if grp == '1' and not only_group:
|
||||
sql = """ select * from servers order by pos"""
|
||||
else:
|
||||
sql = """ select * from servers where groups = '{group}' and ({disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} {apache} order by pos
|
||||
""".format(group=grp, disable=disable, type_ip=type_ip, ip=ip, haproxy=haproxy, nginx=nginx,
|
||||
keepalived=keepalived, apache=apache)
|
||||
""".format(group=grp, disable=disable, type_ip=type_ip, ip=ip, haproxy=haproxy, nginx=nginx, keepalived=keepalived, apache=apache)
|
||||
|
||||
except Exception as e:
|
||||
print(str(e))
|
||||
print('<meta http-equiv="refresh" content="0; url=/app/login.py">')
|
||||
try:
|
||||
print(str(sql))
|
||||
cursor.execute(sql)
|
||||
except Exception as e:
|
||||
out_error(e)
|
||||
|
|
@ -1053,7 +1085,6 @@ def update_slack(token, chanel, group, slack_id):
|
|||
else:
|
||||
return True
|
||||
|
||||
|
||||
def insert_new_option(saved_option, group):
|
||||
try:
|
||||
Option.insert(options=saved_option, groups=group).execute()
|
||||
|
|
@ -2192,6 +2223,7 @@ def select_en_service():
|
|||
return query_res
|
||||
|
||||
|
||||
|
||||
def select_status(smon_id):
|
||||
try:
|
||||
query_res = SMON.get(SMON.id == smon_id).status
|
||||
|
|
@ -2316,12 +2348,14 @@ def smon_list(user_group):
|
|||
if user_group == 1:
|
||||
query = (SMON.select(SMON.ip, SMON.port,SMON.status,SMON.en,SMON.desc,SMON.response_time,SMON.time_state,
|
||||
SMON.group,SMON.script,SMON.http,SMON.http_status,SMON.body,SMON.body_status)
|
||||
.order_by(SMON.group))
|
||||
.order_by(SMON.group)
|
||||
)
|
||||
else:
|
||||
query = (SMON.select(SMON.ip, SMON.port, SMON.status, SMON.en, SMON.desc, SMON.response_time, SMON.time_state,
|
||||
SMON.group, SMON.script, SMON.http, SMON.http_status, SMON.body, SMON.body_status)
|
||||
.where(SMON.user_group == user_group)
|
||||
.order_by(SMON.group))
|
||||
.order_by(SMON.group)
|
||||
)
|
||||
|
||||
try:
|
||||
query_res = query.execute()
|
||||
|
|
@ -3222,7 +3256,6 @@ def insert_new_git(server_id, service_id, repo, branch, period, cred, descriptio
|
|||
else:
|
||||
return True
|
||||
|
||||
|
||||
def select_gits(**kwargs):
|
||||
if kwargs.get("server_id") is not None and kwargs.get("service_id") is not None:
|
||||
query = GitSetting.select().where((GitSetting.server_id == kwargs.get("server_id")) & (GitSetting.service_id == kwargs.get("service_id")))
|
||||
|
|
|
|||
Loading…
Reference in New Issue