diff --git a/ffmap/routertools.py b/ffmap/routertools.py index 509063a..e6d5237 100644 --- a/ffmap/routertools.py +++ b/ffmap/routertools.py @@ -720,7 +720,6 @@ def parse_nodewatcher_xml(xml,statstime): # system "sys_time": datetime.datetime.fromtimestamp(evalxpathint(tree,"/data/system_data/local_time/text()")), "sys_uptime": int(evalxpathfloat(tree,"/data/system_data/uptime/text()")), - "sys_loadavg": evalxpathfloat(tree,"/data/system_data/loadavg/text()"), "memory": { "free": evalxpathint(tree,"/data/system_data/memory_free/text()"), "buffering": evalxpathint(tree,"/data/system_data/memory_buffering/text()"), @@ -761,6 +760,13 @@ def parse_nodewatcher_xml(xml,statstime): router_update["v2"] = bool(router_update["hood"]) + loadavg = evalxpathfloat(tree,"/data/system_data/loadavg/text()",None) + if not loadavg == None: + router_update["sys_loadavg"] = loadavg + else: + router_update["sys_loadavg"] = evalxpathfloat(tree,"/data/system_data/loadavg5/text()") + + try: lng = evalxpathfloat(tree,"/data/system_data/geo/lng/text()") except ValueError: