Proper exception handling clean up.

Signed-off-by: Tim <timothyasir@gluster.com>

8 files changed, 90 insertions, 90 deletions

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py
index ff994731..3b44e3a8 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py
@@ -44,7 +44,7 @@ class Disk:
         try: 
             if dev.GetProperty('storage.removable'):
                 disk_size = str(int(dev.GetProperty('storage.removable.media_size')) / 1024**2)
-        except:
+        except:  # TODO: Add appropriated exception on property error.
             return
 
         self.disks.append({
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
index 71b737e9..b28ab0f7 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
@@ -301,9 +301,9 @@ def getDiskInfo(diskDeviceList=None):
                     try:
                         used = long(rv["Stdout"].split("\n")[1].split()[2]) / 1024
                         diskSpaceInUse += used
-                    except IndexError:
+                    except IndexError, e:
                         pass
-                    except ValueError:
+                    except ValueError, e:
                         pass
 
             if disk["Device"] == partitionDevice:
@@ -431,9 +431,9 @@ def getDeviceUsedSpace(device):
     if rv["Status"] == 0:
         try:
             return long(rv["Stdout"].split("\n")[1].split()[2]) / 1024
-        except IndexError:
+        except IndexError, e:
             pass
-        except ValueError:
+        except ValueError, e:
             pass
 
 def getDiskSizeInfo(partition):
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
index a9adf4de..368b7a15 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
@@ -39,7 +39,7 @@ def readFsTab(fsTabFile=Globals.FSTAB_FILE):
             fsTabEntry["Options"] = tokens[3]
             fsTabEntry["DumpOption"] = tokens[4]
             fsTabEntry["fsckOrder"] = tokens[5]
-        except IndexError:
+        except IndexError, e:
             pass
         if fsTabEntry["Device"] and fsTabEntry["MountPoint"] and fsTabEntry["FsType"] and fsTabEntry["Options"]:
             fsTabEntryList.append(fsTabEntry)
@@ -81,7 +81,7 @@ def removeFsTabEntry(fsTabEntry, fsTabFile=Globals.FSTAB_FILE):
 
     try:
         fsTabEntryList.remove(fsTabEntry)
-    except ValueError:
+    except ValueError, e:
         return False
 
     return writeFsTab(fsTabEntryList, fsTabFile)
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
index b5bb0ffc..27a9c056 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
@@ -32,8 +32,8 @@ def readHostFile(fileName=None):
                 continue
             hostEntryList.append({tokens[0] : tokens[1:]})
         return hostEntryList
-    except IOError:
-        log("failed to read %s file" % fileName)
+    except IOError, e:
+        log("failed to read %s file: %s" % (fileName, str(e)))
         return None
 
 
@@ -49,8 +49,8 @@ def writeHostFile(hostEntryList, fileName=None):
         fp.close()
         if hostFile == fileName:
             return True
-    except IOError:
-        log("failed to write %s file" % hostFile)
+    except IOError, e:
+        log("failed to write %s file: %s" % (hostFile, str(e)))
         return False
     if runCommand("mv -f %s /etc/hosts" % hostFile, root=True) != 0:
         log("failed to rename file %s to /etc/hosts" % hostFile)
@@ -81,8 +81,8 @@ def readResolvConfFile(fileName=None, includeLocalHost=False):
                 searchDomain = tokens[1:]
                 continue
         return nameServerList, domain, searchDomain
-    except IOError:
-        log("failed to read %s file" % fileName)
+    except IOError, e:
+        log("failed to read %s file: %s" % (fileName, str(e)))
         return None, None, None
 
 
@@ -104,8 +104,8 @@ def writeResolvConfFile(nameServerList, domain, searchDomain, fileName=None, app
         fp.close()
         if resolvConfFile == fileName:
             return True
-    except IOError:
-        log("failed to write %s file" % resolvConfFile)
+    except IOError, e:
+        log("failed to write %s file: %s" % (resolvConfFile, str(e)))
         return False
     if runCommand("mv -f %s %s" % (resolvConfFile, Globals.RESOLV_CONF_FILE), root=True) != 0:
         log("failed to rename file %s to %s" % (resolvConfFile, Globals.RESOLV_CONF_FILE))
@@ -123,8 +123,8 @@ def readIfcfgConfFile(deviceName, root=""):
                 continue
             conf[tokens[0].strip().lower()] = tokens[1].strip()
         return conf
-    except IOError:
-        log("failed to read %s file" % fileName)
+    except IOError, e:
+        log("failed to read %s file: %s" % (fileName, str(e)))
         return None
 
 
@@ -162,8 +162,8 @@ def writeIfcfgConfFile(deviceName, conf, root="", deviceFile=None):
         fp.close()
         if ifcfgConfFile == deviceFile:
             return True
-    except IOError:
-        log("failed to write %s file" % ifcfgConfFile)
+    except IOError, e:
+        log("failed to write %s file" % (ifcfgConfFile, str(e)))
         return False
     if runCommand("mv -f %s %s" % (ifcfgConfFile, deviceFile), root=True) != 0:
         log("failed to rename file %s to %s" % (ifcfgConfFile, deviceFile))
@@ -189,7 +189,7 @@ def getNetDeviceDetail(deviceName):
                 try:
                     deviceDetail['Ip'] = tokens[1].strip().split()[0]
                     deviceDetail['Mask'] = tokens[-1].strip()
-                except IndexError:
+                except IndexError, e:
                     pass
             break
     return deviceDetail
@@ -252,8 +252,8 @@ def getBondMode(deviceName, fileName=None):
                 if tokens[5].startswith("mode="):
                     return tokens[5].split("=")[1]
         return None
-    except IOError:
-        log("failed to read %s file" % fileName)
+    except IOError, e:
+        log("failed to read %s file: %s" % (fileName, str(e)))
         return None
 
 
@@ -264,8 +264,8 @@ def setBondMode(deviceName, mode, fileName=None):
     try:
         fp = open(tempFileName, "w")
         lines = open(fileName).readlines()
-    except IOError:
-        log("unable to open file %s" % Globals.MODPROBE_CONF_FILE)
+    except IOError, e:
+        log("unable to open file %s: %s" % (Globals.MODPROBE_CONF_FILE, str(e)))
         return False
     for line in lines:
         tokens = line.split()
@@ -329,7 +329,7 @@ def getNetDeviceList(root=""):
         netDevice["speed"] = getNetSpeed(deviceName)
         try:
             netDevice["hwaddr"] = open("/sys/class/net/%s/address" % deviceName).read().strip()
-        except IOError:
+        except IOError, e:
             pass
         
         netDeviceList.append(netDevice)
@@ -339,17 +339,17 @@ def getNetDeviceList(root=""):
             continue
         try:
             netDevice["onboot"] = conf["onboot"]
-        except KeyError:
+        except KeyError, e:
             pass
         try:
             netDevice["bootproto"] = conf["bootproto"]
-        except KeyError:
+        except KeyError, e:
             pass
         if conf.has_key("ipaddr") and conf["ipaddr"]:
             netDevice["ipaddr"] = conf["ipaddr"]
         try:
             netDevice["netmask"] = conf["netmask"]
-        except KeyError:
+        except KeyError, e:
             pass
         if conf.has_key("gateway") and conf["gateway"]:
             netDevice["gateway"] = conf["gateway"]
@@ -357,35 +357,35 @@ def getNetDeviceList(root=""):
             netDevice["gateway"] = getNetDeviceGateway(deviceName)
         try:
             netDevice["peerdns"] = conf["peerdns"]
-        except KeyError:
+        except KeyError, e:
             pass
         try:
             netDevice["autodns"] = conf["autodns"]
-        except KeyError:
+        except KeyError, e:
             pass
         try:
             netDevice["dns1"] = conf["dns1"]
-        except KeyError:
+        except KeyError, e:
             pass
         try:
             netDevice["dns2"] = conf["dns2"]
-        except KeyError:
+        except KeyError, e:
             pass
         try:
             netDevice["dns3"] = conf["dns3"]
-        except KeyError:
+        except KeyError, e:
             pass
         try:
             netDevice["master"] = conf["master"]
-        except KeyError:
+        except KeyError, e:
             pass
         try:
             netDevice["slave"] = conf["slave"]
-        except KeyError:
+        except KeyError, e:
             pass
         try:
             netDevice["nmcontrolled"] = conf["nmcontrolled"]
-        except KeyError:
+        except KeyError, e:
             pass
 
     return netDeviceList
@@ -414,12 +414,12 @@ def configureDhcpServer(serverIpAddress, dhcpIpAddress):
             if token[0] == "dhcp":
                 serverPortString = token[1]
                 break
-    except IOError:
-        log(syslog.LOG_ERR, "Failed to read /proc/cmdline.  Continuing with default port 68")
+    except IOError, e:
+        log(syslog.LOG_ERR, "Failed to read /proc/cmdline.  Continuing with default port 68: %s" % str(e))
     try:
         serverPort = int(serverPortString)
-    except ValueError:
-        log(syslog.LOG_ERR, "Invalid dhcp port '%s' in /proc/cmdline.  Continuing with default port 68" % serverPortString)
+    except ValueError, e:
+        log(syslog.LOG_ERR, "Invalid dhcp port '%s' in /proc/cmdline.  Continuing with default port 68: %s" % (serverPortString, str(e)))
         serverPort = 68
 
     try:
@@ -433,8 +433,8 @@ def configureDhcpServer(serverIpAddress, dhcpIpAddress):
         #fp.write("server=%s\n" % serverIpAddress)
         #fp.write("dhcp-script=/usr/sbin/server-info\n")
         fp.close()
-    except IOError:
-        log(syslog.LOG_ERR, "unable to write dnsmasq dhcp configuration %s" % tmpDhcpConfFile)
+    except IOError, e:
+        log(syslog.LOG_ERR, "unable to write dnsmasq dhcp configuration %s: %s" % (tmpDhcpConfFile, str(e)))
         return False
     if runCommand("mv -f %s %s" % (tmpDhcpConfFile, Globals.DNSMASQ_DHCP_CONF_FILE), root=True) != 0:
         log(syslog.LOG_ERR, "unable to copy dnsmasq dhcp configuration to %s" % Globals.DNSMASQ_DHCP_CONF_FILE)
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
index ccd5815b..da396ad9 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
@@ -57,7 +57,7 @@ def getServerDetails(listall):
         deviceList[device["device"]] = device
         try:
             macAddress = open("/sys/class/net/%s/address" % device["device"]).read().strip()
-        except IOError:
+        except IOError, e:
             continue
         interfaceTag = responseDom.createTag("networkInterface", None)
         interfaceTag.appendChild(responseDom.createTag("name",  device["device"]))
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Protocol.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Protocol.py
index a11164f7..9649e534 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Protocol.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Protocol.py
@@ -189,7 +189,7 @@ class XDOM:
             self._domObj.writexml(fp, indent, addindent, newl)
             fp.close()
             return True
-        except IOError:
+        except IOError, e:
             return False
 
     def toString(self, indent="  ", newl="\n", encoding = None):
@@ -210,7 +210,7 @@ class XDOM:
             return None
         try:
             return self.getElementsByTagName("command")[0].getAttribute(attributeName)
-        except IndexError:
+        except IndexError, e:
             return False
 
     def setAttribute(self, attributeName, attributeValue):
@@ -218,7 +218,7 @@ class XDOM:
             return None
         try:
             return self.getElementsByTagName("command")[0].setAttribute(attributeName, attributeValue)
-        except IndexError:
+        except IndexError, e:
             return False
 
     def getRequestCommand(self):
@@ -269,9 +269,9 @@ class RequestXml(XDOM):
                 self._domObj = MDOM.parse(requestString)
             elif XML_STRING == type:
                 self._domObj = MDOM.parseString(requestString)
-        except IOError:
+        except IOError, e:
             XDOM.__init__(self)
-        except xml.parsers.expat.ExpatError:
+        except xml.parsers.expat.ExpatError, e:
             XDOM.__init__(self)
 
 ##--end of RequestXML
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
index 1be678a5..ff90143e 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
@@ -146,22 +146,22 @@ def runCommandFG(command, stdout=False, stderr=False,
 def IP2Number(ipString):
     try:
         return socket.htonl(struct.unpack("I", socket.inet_aton(ipString))[0])
-    except socket.error:
+    except socket.error, e:
         return None
-    except TypeError:
+    except TypeError, e:
         return None
-    except struct.error:
+    except struct.error, e:
         return None
 
 
 def Number2IP(number):
     try:
         return socket.inet_ntoa(struct.pack("I", socket.ntohl(number)))
-    except socket.error:
+    except socket.error, e:
         return None
-    except AttributeError:
+    except AttributeError, e:
         return None
-    except ValueError:
+    except ValueError, e:
         return None
 
 
@@ -178,7 +178,7 @@ def computeHostName(hostName):
     hostPrefix = hostName[:pos+1]
     try:
         hostIndex = int(hostName[pos+1:]) 
-    except ValueError:
+    except ValueError, e:
         hostIndex = 0
     # TODO: Check the availablity of the (server) name
     return "%s%s" % (hostPrefix, hostIndex + 1)
@@ -190,7 +190,7 @@ def daemonize():
         if pid > 0:
             # exit first parent
             sys.exit(0) 
-    except OSError, e: 
+    except OSError, e:
         #sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
         return False
 	
@@ -225,7 +225,7 @@ def getDownloadStatus(fileName):
     try:
         lines = [line for line in open(fileName)
                  if "saved" in line or "%" in line]
-    except IOError:
+    except IOError, e:
         return 0
     if not lines:
         return 0
@@ -292,8 +292,8 @@ def getCpuUsageAvg():
 def getLoadavg():
     try:
         loadavgstr = open('/proc/loadavg', 'r').readline().strip()
-    except IOError:
-        syslog.syslog(syslog.LOG_ERR, "failed to find cpu load")
+    except IOError, e:
+        syslog.syslog(syslog.LOG_ERR, "failed to find cpu load: %s" % str(e))
         return None
 
     data = map(float, loadavgstr.split()[1:])
@@ -329,7 +329,7 @@ def getPasswordHash(userName):
     try:
         #return spwd.getspnam(userName).sp_pwd
         return "Not implimented"
-    except KeyError:
+    except KeyError, e:
         return None
 
 
@@ -342,12 +342,12 @@ def isUserExist(userName):
     try:
         grp.getgrnam(userName).gr_gid
         return True
-    except KeyError:
+    except KeyError, e:
         pass
     try:
         pwd.getpwnam(userName).pw_uid
         return True
-    except KeyError:
+    except KeyError, e:
         pass
     return False
 
@@ -371,7 +371,7 @@ def getPlatformVersion(fileName=Globals.GLUSTER_VERSION_FILE):
             if k.upper() == "UPDATE":
                 versionInfo["Update"] = v
     except IOError, e:
-        log("Failed to read file %s: %s" % (fileName, e))
+        log("Failed to read file %s: %s" % (fileName, str(e)))
     return versionInfo
 
 
@@ -395,7 +395,7 @@ def setPlatformVersion(versionInfo, fileName=Globals.GLUSTER_VERSION_FILE):
         fp.close()
         return True
     except IOError, e:
-        log("Failed to write file %s: %s" % (fileName, e))
+        log("Failed to write file %s: %s" % (fileName, str(e)))
     return False
 
 
@@ -408,7 +408,7 @@ def removeFile(fileName, root=False):
         os.remove(fileName)
         return True
     except OSError, e:
-        log("Failed to remove file %s: %s" % (fileName, e))
+        log("Failed to remove file %s: %s" % (fileName, str(e)))
     return False
 
 
@@ -425,9 +425,9 @@ def getIPIndex(indexFile):
         line = fp.readline()
         fp.close()
         index = int(line)
-    except IOError:
+    except IOError, e:
         index = 0
-    except ValueError:
+    except ValueError, e:
         index = False
     return index
 
@@ -436,34 +436,34 @@ def setIPIndex(index, indexFile):
         fp = open(indexFile, "w")
         fp.write(str(index))
         fp.close()
-    except IOError:
+    except IOError, e:
         return False
     return True
 
 def IP2Number(ipString):
     try:
         return socket.htonl(struct.unpack("I", socket.inet_aton(ipString))[0])
-    except socket.error:
+    except socket.error, e:
         return None
-    except TypeError:
+    except TypeError, e:
         return None
-    except struct.error:
+    except struct.error, e:
         return None
 
 def Number2IP(number):
     try:
         return socket.inet_ntoa(struct.pack("I", socket.ntohl(number)))
-    except socket.error:
+    except socket.error, e:
         return None
-    except AttributeError:
+    except AttributeError, e:
         return None
-    except ValueError:
+    except ValueError, e:
         return None
 
 def hasEntryFoundInFile(searchString, dnsEntryFileName):
     try:
         addServerEntryList = open(dnsEntryFileName).read().split()
-    except IOError:
+    except IOError, e:
         return None
     if searchString in addServerEntryList:
         return True
@@ -509,7 +509,7 @@ def setHostNameAndIp(hostName, ipAddress, lastAddServerDetailFile):
         fp.write("HOSTNAME=" + hostName + "\n")
         fp.write("IPADDRESS=" + ipAddress);
         fp.close()
-    except IOError:
+    except IOError, e:
         return False
     return True
 
@@ -519,9 +519,9 @@ def getPort():
         portString = fd.readline()
         fd.close()
         port = int(portString)
-    except IOError:
+    except IOError, e:
         port = Globals.DEFAULT_PORT - 2
-    except ValueError:
+    except ValueError, e:
         port = Globals.DEFAULT_PORT - 2
     return port
 
@@ -530,7 +530,7 @@ def setPort(port):
         fd = open(Globals.PORT_FILE, "w")
         fd.write(str(port))
         fd.close()
-    except IOError:
+    except IOError, e:
         return False
     return True
 
@@ -597,8 +597,8 @@ def getStoragePoolInfo():
                 startRange = tokens[1].strip()
             if tokens[0] == "ENDRANGE":
                 endRange = tokens[1].strip()
-    except IOError:
-        log(syslog.LOG_ERR, "unable to read %s file" % Globals.GLUSTER_SERVER_POOL_FILE)
+    except IOError, e:
+        log(syslog.LOG_ERR, "unable to read %s file: %s" % (Globals.GLUSTER_SERVER_POOL_FILE, str(e)))
     return startRange, endRange
 
 def configureDnsmasq(serverIpAddress, dhcpIpAddress):
@@ -610,12 +610,12 @@ def configureDnsmasq(serverIpAddress, dhcpIpAddress):
             if token[0] == "dhcp":
                 serverPortString = token[1]
                 break
-    except IOError:
-        log(syslog.LOG_ERR, "Failed to read /proc/cmdline.  Continuing with default port 68")
+    except IOError, e:
+        log(syslog.LOG_ERR, "Failed to read /proc/cmdline.  Continuing with default port 68: %s" % str(e))
     try:
         serverPort = int(serverPortString)
-    except ValueError:
-        log(syslog.LOG_ERR, "Invalid dhcp port '%s' in /proc/cmdline.  Continuing with default port 68" % serverPortString)
+    except ValueError, e:
+        log(syslog.LOG_ERR, "Invalid dhcp port '%s' in /proc/cmdline.  Continuing with default port 68: %s" % (serverPortString, str(e)))
         serverPort = 68
 
     try:
@@ -632,8 +632,8 @@ def configureDnsmasq(serverIpAddress, dhcpIpAddress):
         fp.write("server=%s\n" % serverIpAddress)
         fp.write("dhcp-script=/usr/sbin/server-info\n")
         fp.close()
-    except IOError:
-        log(syslog.LOG_ERR, "unable to write dnsmasq configuration %s" % dnsmasqConfFile)
+    except IOError, e:
+        log(syslog.LOG_ERR, "unable to write dnsmasq configuration %s: %s" % (dnsmasqConfFile, str(e)))
         return False
     if runCommand(["cp", "-f", Globals.GLUSTER_CONF_CONF_DIR + "/dnsmasq.conf", Globals.DNSMASQ_CONF_FILE], root=True) != 0:
         log(syslog.LOG_ERR, "unable to copy dnsmasq configuration to " + Globals.DNSMASQ_CONF_FILE)
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py b/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
index beff388b..22c023cc 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
@@ -182,7 +182,7 @@ class XDOM:
             self._domObj.writexml(fp, indent, addindent, newl)
             fp.close()
             return True
-        except IOError:
+        except IOError, e:
             return False
 
     def toString(self, indent="  ", newl="\n", encoding = None):
@@ -218,9 +218,9 @@ class RequestXml(XDOM):
                 self._domObj = MDOM.parse(requestString)
             elif XML_STRING == type:
                 self._domObj = MDOM.parseString(requestString)
-        except IOError:
+        except IOError, e:
             XDOM.__init__(self)
-        except xml.parsers.expat.ExpatError:
+        except xml.parsers.expat.ExpatError, e:
             XDOM.__init__(self)
 
 ##--end of RequestXML