From 42725426ec02d359b67cd8d665afe17882d38958 Mon Sep 17 00:00:00 2001 From: ficus Date: Sat, 15 Sep 2012 19:46:49 +0200 Subject: more WIP --- helpers/sysstatus.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'helpers/sysstatus.py') diff --git a/helpers/sysstatus.py b/helpers/sysstatus.py index b2eec6f..933f625 100644 --- a/helpers/sysstatus.py +++ b/helpers/sysstatus.py @@ -12,6 +12,28 @@ def get_system_status(): d['uptime'] = cli_read('uptime') return d +def get_resources_status(): + d = dict() + disk_info = cli_read_lines('df -h /home')[1].split() + d['disk_used'] = disk_info[2] + d['disk_avail'] = disk_info[1] + d['disk_percent'] = int(disk_info[4][:-1]) + + ram_info = cli_read_lines('free -m')[1].split() + d['ram_used'] = "%sMB" % ram_info[2] + d['ram_avail'] = "%sMB" % ram_info[1] + d['ram_percent'] = int(float(ram_info[2])/float(ram_info[1]) * 100.0) + + d['cpu_cores'] = 1 + for l in open('/proc/cpuinfo', 'r'): + if l.split(":")[0].strip() == "cpu cores": + d['cpu_cores'] = int(l.split(":")[-1].strip()) + break + cpu_info = cli_read('uptime') + d['cpu_load'] = cpu_info.split()[-3].strip(',') + d['cpu_percent'] = int(float(d['cpu_load'])/float(d['cpu_cores']) * 100.0) + return d + def get_dmesg(): try: return cli_read('dmesg') @@ -21,14 +43,14 @@ def get_dmesg(): def get_authlog(): try: with open('/var/log/auth.log') as f: - return '\n'.join(f.readlines()) + return ''.join(f.readlines()) except IOError: return None def get_syslog(): try: with open('/var/log/syslog') as f: - return '\n'.join(f.readlines()) + return ''.join(f.readlines()) except IOError: return None -- cgit v1.2.3