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

v7.1.0.0 

Changelog: https://roxy-wi.org/changelog#7.1.0
pull/375/head
Aidaho 2023-12-31 13:33:02 +03:00
parent d7ba3ff76c
commit 3f9a640cdf
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/api_funct.py
View File

@ -852,6 +852,8 @@ def create_ha_cluster():
except Exception as e: except Exception as e:
data['status'] = f'error: Cannot create HA cluster: {e}' data['status'] = f'error: Cannot create HA cluster: {e}'
return data['status'] return data['status']
else:
data['status'].setdefault('cluster', 'done')
try: try:
service_mod.install_service('keepalived', body) service_mod.install_service('keepalived', body)
except Exception as e: except Exception as e:

16
app/routes/server/routes.py
View File

@ -134,22 +134,6 @@ def update_server():
sql.update_server(name, group, typeip, enable, master, serv_id, cred, port, desc, firewall, protected) sql.update_server(name, group, typeip, enable, master, serv_id, cred, port, desc, firewall, protected)
server_ip = sql.select_server_ip_by_id(serv_id) server_ip = sql.select_server_ip_by_id(serv_id)
roxywi_common.logging(server_ip, f'The server {name} has been update', roxywi=1, login=1, keep_history=1, service='server') roxywi_common.logging(server_ip, f'The server {name} has been update', roxywi=1, login=1, keep_history=1, service='server')
if master == 0:
try:
sql.delete_ha_cluster_delete_slave(serv_id)
roxywi_common.logging(server_ip, f'The server {name} has been removed from HA cluster', roxywi=1, login=1,
keep_history=1, service='server')
except Exception as e:
roxywi_common.logging(server_ip, f'error: Cannot delete the server {name} from HA cluster: {e}', roxywi=1, login=1,
keep_history=1, service='server')
raise Exception(f'error: Cannot delete the server {name} from HA cluster: {e}')
else:
try:
sql.ha_cluster_add_slave(serv_id, master)
except Exception as e:
roxywi_common.logging(server_ip, f'error: Cannot add the server {name} to HA cluster: {e}', roxywi=1, login=1,
keep_history=1, service='server')
raise Exception(f'error: Cannot add the server {name} to HA cluster: {e}')
return 'ok' return 'ok'