freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity

statistics.html: Check for GW and hood when using selector 

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2018-01-18 14:11:29 +01:00
parent a5b06d62c6
commit 94b9d92b8a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffmap/web/application.py
View File

@ -356,6 +356,14 @@ def global_gwstatistics(selectgw):
def helper_statistics(mysql,stats,selecthood,selectgw):
try:
hoods = stattools.hoods(mysql,selectgw)
gws = stattools.gws(mysql,selecthood)
if selecthood and not selecthood in hoods:
mysql.close()
return "Hood not found"
if selectgw and not selectgw in gws:
mysql.close()
return "Gateway not found"
stats = mysql.utcawaretupleint(stats,"time")
@ -394,7 +402,6 @@ def helper_statistics(mysql,stats,selecthood,selectgw):
router_firmwares = stattools.router_firmwares(mysql,selecthood,selectgw)
hoods_sum = stattools.hoods_sum(mysql,selectgw)
hoods_gws = stattools.hoods_gws(mysql)
gws = stattools.gws(mysql,selecthood)
gws_sum = stattools.gws_sum(mysql,selecthood)
gws_info = stattools.gws_info(mysql,selecthood)
gws_admin = stattools.gws_admin(mysql,selectgw)