nikon/tuned
1
0
Fork 0
Code Activity Actions

net: device type determination, handle IOError

Browse source 
- handle the situation, when checked /path does not exist (bz #707079)
This commit is contained in:
Jan Vcelak 2011-05-24 10:24:04 +02:00
parent d78b41e9ff
commit ba38290e92
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
monitorplugins/net.py
View file

@ -52,15 +52,14 @@ class NetMonitor:
return len(card.supported_modes) > 1 and card.get_max_speed() >= 1000 return len(card.supported_modes) > 1 and card.get_max_speed() >= 1000
def _device_type(self, name): def _device_type(self, name):
path = os.path.join("/sys/class/net", name)
path = os.path.join(os.path.dirname(path), os.readlink(path))
path = os.path.normpath(path)
try: try:
path = os.path.join("/sys/class/net", name)
path = os.path.join(os.path.dirname(path), os.readlink(path))
path = os.path.normpath(path)
devtype = re.match(r"/sys/devices/([^/]+)/", path).group(1) devtype = re.match(r"/sys/devices/([^/]+)/", path).group(1)
except AttributeError: except (IOError, AttributeError):
devtype = "unknown" devtype = "unknown"
log.warn("Cannot determine type of '%s' (%s)." % (name, path)) log.warn("Cannot determine type of '%s'." % name)
log.debug("Found network device: %s (%s)" % (name, devtype)) log.debug("Found network device: %s (%s)" % (name, devtype))
return devtype return devtype