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

Don't ask netmon for WebUI router's position

This commit is contained in:
Dominik Heidler 2016-03-10 14:00:12 +01:00
parent d8bbbf1213
commit 179c403787
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ffmap/routertools.py
View File

@ -33,17 +33,19 @@ def import_nodewatcher_xml(mac, xml):
router_update = parse_nodewatcher_xml(xml)
if not router or not "netmon_id" in router:
# new router
# fetch additional information from netmon as it is not yet contained in xml
router_info = netmon_fetch_router_info(mac)
if router_info:
events.append({
"time": datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc),
"type": "netmon",
"comment": "Fetched metadata from netmon",
})
router_update.update(router_info)
if not "position" in router_update:
# pre-webui router
if not router or not "netmon_id" in router:
# new router
# fetch additional information from netmon as it is not yet contained in xml
router_info = netmon_fetch_router_info(mac)
if router_info:
events.append({
"time": datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc),
"type": "netmon",
"comment": "Fetched metadata from netmon",
})
router_update.update(router_info)
# keep hood up to date
if "position" in router_update: