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

routertools: Fix division by zero for airtime 

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2018-01-21 20:28:39 +01:00
parent 861f10af47
commit c97a036713
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffmap/routertools.py
View File

@ -122,18 +122,24 @@ def import_nodewatcher_xml(mysql, mac, xml, banned, netifdict):
router_update[v] = olddata[v] # preserve contact information after router reset
# Calculate airtime
fields_w2 = (router_update["w2_active"], router_update["w2_busy"], olddata["w2_busy"], olddata["w2_active"],);
fields_w2 = (router_update["w2_active"], router_update["w2_busy"], olddata["w2_busy"], olddata["w2_active"],)
router_update["w2_airtime"] = None
if not any(w == None for w in fields_w2):
diff_active = router_update["w2_active"] - olddata["w2_active"]
diff_busy = router_update["w2_busy"] - olddata["w2_busy"]
router_update["w2_airtime"] = diff_busy / diff_active # auto float-division in Python3
fields_w5 = (router_update["w5_active"], router_update["w5_busy"], olddata["w5_busy"], olddata["w5_active"],);
if diff_active:
router_update["w2_airtime"] = diff_busy / diff_active # auto float-division in Python3
else:
router_update["w2_airtime"] = 0
fields_w5 = (router_update["w5_active"], router_update["w5_busy"], olddata["w5_busy"], olddata["w5_active"],)
router_update["w5_airtime"] = None
if not any(w == None for w in fields_w5):
diff_active = router_update["w5_active"] - olddata["w5_active"]
diff_busy = router_update["w5_busy"] - olddata["w5_busy"]
router_update["w5_airtime"] = diff_busy / diff_active # auto float-division in Python3
if diff_active:
router_update["w5_airtime"] = diff_busy / diff_active # auto float-division in Python3
else:
router_update["w5_airtime"] = 0
if router_id:
# statistics