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

v8.0.2: Refactor service addition logic in HA cluster creation 

Re-order the insertion of services to occur earlier in the HA cluster creation process. This ensures that services are added to the database right after the cluster is created, improving the sequence and readability of operations.
pull/399/head
Aidaho 2024-09-26 17:43:56 +03:00
parent 34907769e6
commit 5acebf62bd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/modules/service/ha_cluster.py
View File

@ -35,6 +35,16 @@ def create_cluster(cluster: HAClusterRequest, group_id: int) -> int:
except Exception as e:
raise Exception(f'error: Cannot create new HA cluster: {e}')
for service, value in services.items():
if not value['enabled']:
continue
try:
service_id = service_sql.select_service_id_by_slug(service)
ha_sql.insert_cluster_services(cluster_id, service_id)
roxywi_common.logging(cluster_id, f'Service {service} has been enabled on the cluster', keep_history=1, roxywi=1, service='HA cluster')
except Exception as e:
raise Exception(f'error: Cannot add service {service}: {e}')
if not servers is None:
try:
router_id = ha_sql.create_ha_router(cluster_id, default=1)
@ -55,16 +65,6 @@ def create_cluster(cluster: HAClusterRequest, group_id: int) -> int:
if cluster.virt_server and not servers is None:
add_or_update_virt(cluster, servers, cluster_id, vip_id, group_id)
for service, value in services.items():
if not value['enabled']:
continue
try:
service_id = service_sql.select_service_id_by_slug(service)
ha_sql.insert_cluster_services(cluster_id, service_id)
roxywi_common.logging(cluster_id, f'Service {service} has been enabled on the cluster', keep_history=1, roxywi=1, service='HA cluster')
except Exception as e:
raise Exception(f'error: Cannot add service {service}: {e}')
return int(cluster_id)