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

v8.0: Refactor slave routes and clean up redundant code 

Removed unused variable `req_method` and refactored URL assignment logic in `ha.js` for clarity. Updated route in `routes.py` to use defaults for `vip_id` and adjusted method checks accordingly. Removed unnecessary print statement in `ha_cluster.py`.
pull/399/head
Aidaho 2024-08-28 15:10:39 +03:00
parent 3ca7ca86a1
commit a0866b9e88
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,6 @@ def update_vip(cluster_id: int, router_id: int, cluster: Union[HAClusterRequest,
s = server_sql.get_server_by_id(value['id']) s = server_sql.get_server_by_id(value['id'])
raise Exception(f'error: Cannot add server {s.hostname}: {e}') raise Exception(f'error: Cannot add server {s.hostname}: {e}')
print('cluster.virt_server',cluster.virt_server)
if cluster.virt_server: if cluster.virt_server:
add_or_update_virt(cluster, servers, cluster_id, vip_id, group_id) add_or_update_virt(cluster, servers, cluster_id, vip_id, group_id)
else: else:

5
app/routes/ha/routes.py
View File

@ -112,12 +112,13 @@ def show_ha_cluster(service, cluster_id):
return render_template('service.html', **kwargs) return render_template('service.html', **kwargs)
@bp.route('/<service>/slaves/<int:cluster_id>/<int:vip_id>', methods=['GET', 'POST']) @bp.route('/<service>/slaves/<int:cluster_id>', defaults={'vip_id': False}, methods=['GET'])
@bp.route('/<service>/slaves/<int:cluster_id>/<int:vip_id>', methods=['GET'])
@check_services @check_services
@get_user_params() @get_user_params()
def get_slaves(service, cluster_id, vip_id): def get_slaves(service, cluster_id, vip_id):
lang = g.user_params['lang'] lang = g.user_params['lang']
if request.method == 'GET': if not vip_id:
router_id = ha_sql.get_router_id(cluster_id, default_router=1) router_id = ha_sql.get_router_id(cluster_id, default_router=1)
else: else:
vip = ha_sql.select_cluster_vip_by_vip_id(cluster_id, vip_id) vip = ha_sql.select_cluster_vip_by_vip_id(cluster_id, vip_id)

9
app/static/js/ha.js
View File

@ -507,7 +507,6 @@ function add_vip_ha_cluster(cluster_id, cluster_name, vip_id='', vip='', edited=
let save_word = translate_div.attr('data-save'); let save_word = translate_div.attr('data-save');
let tabel_title = $("#add-vip-table").attr('title'); let tabel_title = $("#add-vip-table").attr('title');
let buttons = []; let buttons = [];
let req_method = 'GET';
if (edited) { if (edited) {
$.ajax({ $.ajax({
url: api_prefix + "/ha/cluster/" + cluster_id + "/vip/" + vip_id, url: api_prefix + "/ha/cluster/" + cluster_id + "/vip/" + vip_id,
@ -534,7 +533,6 @@ function add_vip_ha_cluster(cluster_id, cluster_name, vip_id='', vip='', edited=
} }
}); });
$('#vrrp-ip-add').val(vip); $('#vrrp-ip-add').val(vip);
req_method = 'POST';
tabel_title = $("#add-vip-table").attr('data-edit'); tabel_title = $("#add-vip-table").attr('data-edit');
buttons = [{ buttons = [{
text: save_word, text: save_word,
@ -593,9 +591,12 @@ function add_vip_ha_cluster(cluster_id, cluster_name, vip_id='', vip='', edited=
} }
}] }]
} }
let url = "/ha/cluster/slaves/" + cluster_id;
if (vip_id) {
url = "/ha/cluster/slaves/" + cluster_id + "/" + vip_id;
}
$.ajax({ $.ajax({
url: "/ha/cluster/slaves/" + cluster_id + "/" + vip_id, url: url,
type: req_method,
success: function (data) { success: function (data) {
if (data.indexOf('error:') != '-1') { if (data.indexOf('error:') != '-1') {
toastr.error(data); toastr.error(data);