mirror of https://github.com/Aidaho12/haproxy-wi
v8.2: Fix formatting and enhance logging error handling
Adjusted line formatting in `runtime.py` and `waf.py` for consistency and readability. Added exception handling for logging in `auth.py` to prevent crashes and provide error feedback.pull/399/head
parent
a9aa9f2436
commit
f6298cd911
|
@ -126,8 +126,8 @@ def change_ip_and_port(serv, backend_backend, backend_server, backend_ip, backen
|
|||
|
||||
for master in masters:
|
||||
if master[0] is not None:
|
||||
cmd = f'echo "set server {backend_backend}/{backend_server} addr {backend_ip} port {backend_port} ' \
|
||||
f'check-port {backend_port}" |nc {master[0]} {sock_port}'
|
||||
cmd = (f'echo "set server {backend_backend}/{backend_server} addr {backend_ip} port {backend_port} '
|
||||
f'check-port {backend_port}" |nc {master[0]} {sock_port}')
|
||||
output, stderr = server_mod.subprocess_execute(cmd)
|
||||
lines += output[0]
|
||||
roxywi_common.logging(
|
||||
|
|
|
@ -58,11 +58,11 @@ def select_waf_servers_metrics_for_master():
|
|||
def select_waf_servers_metrics(group_id):
|
||||
if group_id == '1':
|
||||
query = Waf.select(Server.ip).join(Server, on=(Waf.server_id == Server.server_id)).where(
|
||||
(Server.enabled == 1) & (Waf.metrics == 1)
|
||||
(Server.enabled == 1) & (Waf.metrics == 1)
|
||||
)
|
||||
else:
|
||||
query = Waf.select(Server.ip).join(Server, on=(Waf.server_id == Server.server_id)).where(
|
||||
(Server.enabled == 1) & (Waf.metrics == 1) & (Server.group_id == group_id)
|
||||
(Server.enabled == 1) & (Waf.metrics == 1) & (Server.group_id == group_id)
|
||||
)
|
||||
try:
|
||||
query_res = query.execute()
|
||||
|
|
|
@ -118,7 +118,10 @@ def do_login(user_params: dict, next_url: str):
|
|||
except Exception:
|
||||
user_group_name = ''
|
||||
|
||||
roxywi_common.logging('Roxy-WI server', f' user: {user_params["name"]}, group: {user_group_name} login', roxywi=1)
|
||||
try:
|
||||
roxywi_common.logging('Roxy-WI server', f'user: {user_params["name"]}, group: {user_group_name} login', roxywi=1)
|
||||
except Exception as e:
|
||||
print(str(e))
|
||||
|
||||
return response
|
||||
|
||||
|
|
Loading…
Reference in New Issue