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

Tidy more space with latest from master

pull/321/head
Tom Taylor 2022-05-23 14:38:51 +01:00 committed by GitHub
parent 92523d949e
commit 38178ab326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/sql.py
View File

@ -386,14 +386,12 @@ 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:
@ -2223,7 +2221,6 @@ def select_en_service():
return query_res
def select_status(smon_id):
try:
query_res = SMON.get(SMON.id == smon_id).status
@ -2649,7 +2646,7 @@ def add_server_aws(region, instance_type, public_ip, floating_ip, volume_size, s
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):
try:
ProvisionedServers.insert(region=region, instance_type=instance_type, public_ip=network_type, network_name=network_name,
@ -2794,7 +2791,7 @@ def update_server_do(size, privet_net, floating_ip, ssh_ids, ssh_name, oss, fire
group, status, server_id):
query = ProvisionedServers.update(instance_type=size, private_networking=privet_net,
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,
group_id=group, status=status).where(ProvisionedServers.id == server_id)
try: