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

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 Mysql
pull/321/head
Tom Taylor 2022-05-23 14:21:56 +01:00 committed by GitHub
parent 8d615e9a51
commit 352db60bd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 140 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
app/sql.py
View File

@ -386,12 +386,14 @@ def select_user_groups_with_names(user_id, **kwargs):
if kwargs.get("all") is not None: if kwargs.get("all") is not None:
query = (UserGroups query = (UserGroups
.select(UserGroups.user_group_id, UserGroups.user_id, Groups.name) .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: else:
query = (UserGroups query = (UserGroups
.select(UserGroups.user_group_id, Groups.name) .select(UserGroups.user_group_id, Groups.name)
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id)) .join(Groups, on=(UserGroups.user_group_id == Groups.group_id))
.where(UserGroups.user_id == user_id)) .where(UserGroups.user_id == user_id)
)
try: try:
query_res = query.execute() query_res = query.execute()
except Exception as e: except Exception as e:
@ -490,14 +492,40 @@ def select_server_ip_by_id(server_id):
def select_servers(**kwargs): def select_servers(**kwargs):
cursor = conn.cursor() 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: if kwargs.get("server") is not None:
sql = """select * from servers where ip = '{}' """.format(kwargs.get("server")) sql = """select * from servers where ip = '{}' """.format(kwargs.get("server"))
if kwargs.get("full") is not None: if kwargs.get("full") is not None:
sql = """select * from servers ORDER BY hostname """ sql = """select * from servers ORDER BY hostname """
if kwargs.get("get_master_servers") is not None: 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: if kwargs.get("get_master_servers") is not None and kwargs.get('uuid') is not None:
sql = """ select servers.id, servers.hostname from servers sql = """ select servers.id, servers.hostname from servers
left join user as user on servers.groups = user.groups left join user as user on servers.groups = user.groups
@ -505,14 +533,16 @@ def select_servers(**kwargs):
where uuid.uuid = '{}' and servers.master = 0 and servers.type_ip = 0 and servers.enable = 1 ORDER BY servers.groups where uuid.uuid = '{}' and servers.master = 0 and servers.type_ip = 0 and servers.enable = 1 ORDER BY servers.groups
""".format(kwargs.get('uuid')) """.format(kwargs.get('uuid'))
if kwargs.get("id"): if kwargs.get("id"):
sql = """select * from servers where id='{}' """.format(kwargs.get("id")) sql = """select * from servers where id = '{}' """.format(kwargs.get("id"))
if kwargs.get("hostname"): if kwargs.get("hostname"):
sql = """select * from servers where hostname='{}' """.format(kwargs.get("hostname")) sql = """select * from servers where hostname = '{}' """.format(kwargs.get("hostname"))
if kwargs.get("id_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")) 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"): if kwargs.get("server") and kwargs.get("keep_alive"):
sql = """select active from servers where ip='{}' """.format(kwargs.get("server")) sql = """select active from servers where ip = '{}' """.format(kwargs.get("server"))
try: try:
print(str(sql))
cursor.execute(sql) cursor.execute(sql)
except Exception as e: except Exception as e:
out_error(e) out_error(e)
@ -802,22 +832,24 @@ def get_dick_permit(**kwargs):
if funct.check_user_group(token=token): if funct.check_user_group(token=token):
cursor = conn.cursor() cursor = conn.cursor()
try: try:
if mysql_enable == '1':
if grp == '1' and not only_group: if grp == '1' and not only_group:
sql = """ select * from servers where {} {} {} {} {} {} {} order by pos""" .format(disable, sql = """ select * from `servers` order by `pos` desc"""
type_ip, else:
nginx, sql = """ select * from `servers` where `groups` = {group} and ({disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} {apache} order by `pos` desc
haproxy, """.format(group=grp, disable=disable, type_ip=type_ip, ip=ip, haproxy=haproxy, nginx=nginx, keepalived=keepalived, apache=apache)
keepalived, else:
apache, if grp == '1' and not only_group:
ip) sql = """ select * from servers order by pos"""
else: else:
sql = """ select * from servers where groups = '{group}' and ({disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} {apache} order by pos 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, """.format(group=grp, disable=disable, type_ip=type_ip, ip=ip, haproxy=haproxy, nginx=nginx, keepalived=keepalived, apache=apache)
keepalived=keepalived, apache=apache)
except Exception as e: except Exception as e:
print(str(e)) print(str(e))
print('<meta http-equiv="refresh" content="0; url=/app/login.py">') print('<meta http-equiv="refresh" content="0; url=/app/login.py">')
try: try:
print(str(sql))
cursor.execute(sql) cursor.execute(sql)
except Exception as e: except Exception as e:
out_error(e) out_error(e)
@ -1053,7 +1085,6 @@ def update_slack(token, chanel, group, slack_id):
else: else:
return True return True
def insert_new_option(saved_option, group): def insert_new_option(saved_option, group):
try: try:
Option.insert(options=saved_option, groups=group).execute() Option.insert(options=saved_option, groups=group).execute()
@ -2192,6 +2223,7 @@ def select_en_service():
return query_res return query_res
def select_status(smon_id): def select_status(smon_id):
try: try:
query_res = SMON.get(SMON.id == smon_id).status query_res = SMON.get(SMON.id == smon_id).status
@ -2314,14 +2346,16 @@ def response_time(time, smon_id):
def smon_list(user_group): def smon_list(user_group):
if user_group == 1: if user_group == 1:
query = (SMON.select(SMON.ip, SMON.port, SMON.status, SMON.en, SMON.desc, SMON.response_time, SMON.time_state, 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) SMON.group,SMON.script,SMON.http,SMON.http_status,SMON.body,SMON.body_status)
.order_by(SMON.group)) .order_by(SMON.group)
)
else: else:
query = (SMON.select(SMON.ip, SMON.port, SMON.status, SMON.en, SMON.desc, SMON.response_time, SMON.time_state, 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) SMON.group, SMON.script, SMON.http, SMON.http_status, SMON.body, SMON.body_status)
.where(SMON.user_group == user_group) .where(SMON.user_group == user_group)
.order_by(SMON.group)) .order_by(SMON.group)
)
try: try:
query_res = query.execute() query_res = query.execute()
@ -2617,7 +2651,7 @@ def add_server_aws(region, instance_type, public_ip, floating_ip, volume_size, s
return False return False
def add_server_gcore(project, region, instance_type, network_type, network_name, volume_size, ssh_key_name, name, os, def add_server_gcore(project ,region, instance_type, network_type, network_name, volume_size, ssh_key_name, name, os,
firewall, provider_id, group_id, status, delete_on_termination, volume_type): firewall, provider_id, group_id, status, delete_on_termination, volume_type):
try: try:
ProvisionedServers.insert(region=region, instance_type=instance_type, public_ip=network_type, network_name=network_name, ProvisionedServers.insert(region=region, instance_type=instance_type, public_ip=network_type, network_name=network_name,
@ -2762,7 +2796,7 @@ def update_server_do(size, privet_net, floating_ip, ssh_ids, ssh_name, oss, fire
group, status, server_id): group, status, server_id):
query = ProvisionedServers.update(instance_type=size, private_networking=privet_net, query = ProvisionedServers.update(instance_type=size, private_networking=privet_net,
floating_ip=floating_ip, ssh_ids=ssh_ids, ssh_key_name=ssh_name, floating_ip=floating_ip, ssh_ids=ssh_ids, ssh_key_name=ssh_name,
os=oss, firewall=firewall, monitoring=monitoring, backup=backup, os=oss,firewall=firewall, monitoring=monitoring, backup=backup,
provider_id=provider, provider_id=provider,
group_id=group, status=status).where(ProvisionedServers.id == server_id) group_id=group, status=status).where(ProvisionedServers.id == server_id)
try: try:
@ -3222,7 +3256,6 @@ def insert_new_git(server_id, service_id, repo, branch, period, cred, descriptio
else: else:
return True return True
def select_gits(**kwargs): def select_gits(**kwargs):
if kwargs.get("server_id") is not None and kwargs.get("service_id") is not None: 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"))) query = GitSetting.select().where((GitSetting.server_id == kwargs.get("server_id")) & (GitSetting.service_id == kwargs.get("service_id")))