YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update yunohost_monitor.py

Browse source
This commit is contained in:
abeudin 2013-10-04 12:32:58 +02:00
parent 21de15e4a3
commit 09a267a167
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
yunohost_monitor.py
View file

@ -133,18 +133,17 @@ def monitor_info(memory=False, cpu=False, disk=False, ifconfig=False, uptime=Fal
return json.loads(s.getLoad()) return json.loads(s.getLoad())
elif ifconfig: elif ifconfig:
# TODO: c'est pas ifconfig ça ;) result = {}
result = {} for k, fs in enumerate(json.loads(s.getNetwork())):
for k, fs in enumerate(json.loads(s.getNetwork())): interface = fs['interface_name']
interface = fs['interface_name'] if interface != "lo":
if interface != "lo": ip = get_ip_address(str(interface))
ip = get_ip_address(str(interface)) del fs['interface_name']
del fs['interface_name'] result[ip] = fs
result[ip] = fs else:
else: del fs['interface_name']
del fs['interface_name'] result[interface] = fs
result[interface] = fs return result
return result
elif disk: elif disk:
result = {} result = {}