socialnerds/hive
socialnerds
/
hive
Archived
1
0
Fork 0

cleaned code in diskmon

This commit is contained in:
David 2012-05-20 15:33:10 +02:00
parent 469548c1b5
commit 6b262dfbfa
1 changed files with 1 additions and 22 deletions

View File

@ -11,17 +11,8 @@ import os
class diskmon(object): class diskmon(object):
"""collect information about local partitions""" """collect information about local partitions"""
#constructor
def __init__(self): def __init__(self):
pass self.gather()
# def get_part(self):
# uuids = os.listdir("/dev/disk/by-uuid")
# for uuid in uuids:
# part = []
# part.append("/dev/" + os.readlink("/dev/disk/by-uuid/" + uuid)[6:])
# part.append(uuid)
# yield part
def gather(self): def gather(self):
"""gather the actual information""" """gather the actual information"""
@ -29,34 +20,23 @@ class diskmon(object):
self.partitions = [] #information about all partitions (list of lists) self.partitions = [] #information about all partitions (list of lists)
uuids = os.listdir("/dev/disk/by-uuid") #folder contains symlinks to the actual disk devices uuids = os.listdir("/dev/disk/by-uuid") #folder contains symlinks to the actual disk devices
for uuid in uuids: #write /dev/names as keys and uuids as values in the dictionary for uuid in uuids: #write /dev/names as keys and uuids as values in the dictionary
#part = []
part = {} part = {}
#part.append("/dev/" + os.readlink("/dev/disk/by-uuid/" + uuid)[6:])
#part.append(uuid)
part["device"] = str("/dev/" + os.readlink("/dev/disk/by-uuid/" + uuid)[6:]) part["device"] = str("/dev/" + os.readlink("/dev/disk/by-uuid/" + uuid)[6:])
part["uuid"] = uuid part["uuid"] = uuid
#for part in self.get_part():
#getting mountpoint for partition from mtab #getting mountpoint for partition from mtab
mtab = open("/etc/mtab", "r") mtab = open("/etc/mtab", "r")
#for line in #for line in
for line in mtab: for line in mtab:
if part["device"] in line: if part["device"] in line:
#part.append(line.split()[1])
#part.append(line.split()[2])
part["mountpoint"] = line.split()[1] part["mountpoint"] = line.split()[1]
part["filesystem"] = line.split()[2] part["filesystem"] = line.split()[2]
#getting block infos #getting block infos
if os.path.ismount(part["mountpoint"]): if os.path.ismount(part["mountpoint"]):
fs = os.statvfs(part["mountpoint"]) fs = os.statvfs(part["mountpoint"])
#part.append(fs.f_bsize) #blocksize
#part.append(fs.f_blocks) #total blocks
#part.append(fs.f_bavail) #free blocks
part["blocksize"] = fs.f_bsize #blocksize part["blocksize"] = fs.f_bsize #blocksize
part["total blocks"] = fs.f_blocks #total blocks part["total blocks"] = fs.f_blocks #total blocks
part["free blocks"] = fs.f_bavail #free blocks part["free blocks"] = fs.f_bavail #free blocks
break break
mtab.close() mtab.close()
@ -67,7 +47,6 @@ class diskmon(object):
#output #output
if __name__ == "__main__": if __name__ == "__main__":
diskmoninstance = diskmon() diskmoninstance = diskmon()
diskmoninstance.gather()
for partition in diskmoninstance.partitions: for partition in diskmoninstance.partitions:
print "device:\t\t" + str(partition["device"]) + "\nuuid:\t\t" + str(partition["uuid"]) print "device:\t\t" + str(partition["device"]) + "\nuuid:\t\t" + str(partition["uuid"])
if partition.has_key("mountpoint"): if partition.has_key("mountpoint"):