diff --git a/monitor/disk.py b/monitor/disk.py index e9de2a7..75b45a1 100644 --- a/monitor/disk.py +++ b/monitor/disk.py @@ -28,9 +28,12 @@ class diskmon(object): #getting block infos if os.path.ismount(part["mountpoint"]): fs = os.statvfs(part["mountpoint"]) + part["mounted"] = "1" #mounted flag part["blocksize"] = fs.f_bsize #blocksize part["total blocks"] = fs.f_blocks #total blocks part["free blocks"] = fs.f_bavail #free blocks + part["used blocks"] = part["total blocks"] - part["free blocks"] + part["files"] = fs.f_files #total files break mtab.close() diff --git a/monitor/disk_display.py b/monitor/disk_display.py index dd06a0b..cf166e4 100755 --- a/monitor/disk_display.py +++ b/monitor/disk_display.py @@ -14,7 +14,7 @@ def bytes2human(bytes): return human def blocks2bytes(blocks, blocksize): - bytes = float(blocks) * float(blocksize) + bytes = float(blocks) * float(blocksize) / 1024 return bytes @@ -34,4 +34,7 @@ if __name__ == "__main__": else: print "\n" + print "debug output" + print diskmoninstance.partitions + #end of file