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

v3.2.7

pull/42/head
Aidaho12 2018-09-20 14:06:59 +06:00
parent ea14d50c9e
commit 6e72b709d7
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/funct.py
View File

@ -484,3 +484,5 @@ def get_files(dir = get_config_var('configs', 'haproxy_save_configs_dir'), forma
else: else:
return files return files
def get_key(item):
return item[0]

7
app/options.py
View File

@ -486,7 +486,8 @@ if form.getvalue('metrics'):
for key, value in p.items(): for key, value in p.items():
plots.append(value) plots.append(value)
grid = gridplot(plots, ncols=2, plot_width=800, plot_height=250, toolbar_location = "left", toolbar_options=dict(logo=None)) plots_sorted = sorted(plots, key=funct.get_key)
grid = gridplot(plots_sorted, ncols=2, plot_width=800, plot_height=250, toolbar_location = "left", toolbar_options=dict(logo=None))
show(grid) show(grid)
if form.getvalue('waf_metrics'): if form.getvalue('waf_metrics'):
@ -555,8 +556,8 @@ if form.getvalue('waf_metrics'):
plots = [] plots = []
for key, value in p.items(): for key, value in p.items():
plots.append(value) plots.append(value)
plots_sorted = sorted(plots, key=funct.get_key)
grid = gridplot(plots, ncols=2, plot_width=800, plot_height=250, toolbar_location = "left", toolbar_options=dict(logo=None)) grid = gridplot(plots_sorted, ncols=2, plot_width=800, plot_height=250, toolbar_location = "left", toolbar_options=dict(logo=None))
show(grid) show(grid)
if form.getvalue('get_hap_v'): if form.getvalue('get_hap_v'):

6
app/ovw.py
View File

@ -27,7 +27,7 @@ async def get_runner_overview():
for i, future in enumerate(asyncio.as_completed(futures)): for i, future in enumerate(asyncio.as_completed(futures)):
result = await future result = await future
servers.append(result) servers.append(result)
servers_sorted = sorted(servers, key=getKey) servers_sorted = sorted(servers, key=funct.get_key)
template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value)) template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value))
print(template) print(template)
@ -51,7 +51,7 @@ async def get_runner_overviewWaf(url):
for i, future in enumerate(asyncio.as_completed(futures)): for i, future in enumerate(asyncio.as_completed(futures)):
result = await future result = await future
servers.append(result) servers.append(result)
servers_sorted = sorted(servers, key=getKey) servers_sorted = sorted(servers, key=funct.get_key)
template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value), url=url) template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value), url=url)
print(template) print(template)
@ -83,7 +83,7 @@ async def get_runner_overviewServers():
for i, future in enumerate(asyncio.as_completed(futures)): for i, future in enumerate(asyncio.as_completed(futures)):
result = await future result = await future
servers.append(result) servers.append(result)
servers_sorted = sorted(servers, key=getKey) servers_sorted = sorted(servers, key=funct.get_key)
template = template.render(service_status=servers_sorted) template = template.render(service_status=servers_sorted)
print(template) print(template)