浏览代码

[desktop] Catch the correct exception

Erick Tryzelaar 10 年之前
父节点
当前提交
ffe2c0b

+ 1 - 1
desktop/core/src/desktop/conf.py

@@ -234,7 +234,7 @@ def default_from_email():
   if _default_from_email is None:
   if _default_from_email is None:
     try:
     try:
       fqdn = socket.getfqdn()
       fqdn = socket.getfqdn()
-    except:
+    except IOError:
       fqdn = 'localhost'
       fqdn = 'localhost'
     _default_from_email = "hue@" + fqdn
     _default_from_email = "hue@" + fqdn
   return _default_from_email
   return _default_from_email

+ 3 - 2
desktop/core/src/desktop/lib/conf.py

@@ -613,10 +613,11 @@ def coerce_bool(value):
   if isinstance(value, bool):
   if isinstance(value, bool):
     return value
     return value
 
 
-  try:
+  if isinstance(value, basestring):
     upper = value.upper()
     upper = value.upper()
-  except:
+  else:
     upper = value
     upper = value
+
   if upper in ("FALSE", "0", "NO", "OFF", "NAY", "", None):
   if upper in ("FALSE", "0", "NO", "OFF", "NAY", "", None):
     return False
     return False
   if upper in ("TRUE", "1", "YES", "ON", "YEA"):
   if upper in ("TRUE", "1", "YES", "ON", "YEA"):

+ 2 - 2
desktop/core/src/desktop/lib/daemon_utils.py

@@ -41,14 +41,14 @@ def get_uid_gid(username, groupname=None):
   """
   """
   try:
   try:
     uid, default_grp = pwd.getpwnam(username)[2:4]
     uid, default_grp = pwd.getpwnam(username)[2:4]
-  except:
+  except KeyError:
     raise KeyError("Couldn't get user id for user %s" % (username,))
     raise KeyError("Couldn't get user id for user %s" % (username,))
   if groupname is None:
   if groupname is None:
     gid = default_grp
     gid = default_grp
   else:
   else:
     try:
     try:
       gid = grp.getgrnam(groupname)[2]
       gid = grp.getgrnam(groupname)[2]
-    except:
+    except KeyError:
       raise KeyError("Couldn't get group id for group %s" % (groupname,))
       raise KeyError("Couldn't get group id for group %s" % (groupname,))
   return (uid, gid)
   return (uid, gid)
 
 

+ 1 - 1
desktop/core/src/desktop/lib/security_util.py

@@ -57,7 +57,7 @@ def get_fqdn(hostname_or_ip):
   # Get hostname
   # Get hostname
   try:
   try:
     fqdn = socket.gethostbyaddr(hostname_or_ip)[0]
     fqdn = socket.gethostbyaddr(hostname_or_ip)[0]
-  except:
+  except IOError:
     fqdn = hostname_or_ip
     fqdn = hostname_or_ip
 
 
   if fqdn == 'localhost':
   if fqdn == 'localhost':

+ 8 - 6
desktop/core/src/desktop/lib/wsgiserver.py

@@ -1111,8 +1111,6 @@ class SSL_fileobject(CP_fileobject):
                     # The client is talking HTTP to an HTTPS server.
                     # The client is talking HTTP to an HTTPS server.
                     raise NoSSLError()
                     raise NoSSLError()
                 raise FatalSSLAlert(*e.args)
                 raise FatalSSLAlert(*e.args)
-            except:
-                raise
             
             
             if time.time() - start > self.ssl_timeout:
             if time.time() - start > self.ssl_timeout:
                 raise socket.timeout("timed out")
                 raise socket.timeout("timed out")
@@ -1596,12 +1594,16 @@ class CherryPyWSGIServer(object):
             # AF_UNIX socket
             # AF_UNIX socket
             
             
             # So we can reuse the socket...
             # So we can reuse the socket...
-            try: os.unlink(self.bind_addr)
-            except: pass
+            try:
+              os.unlink(self.bind_addr)
+            except IOError:
+              pass
             
             
             # So everyone can access the socket...
             # So everyone can access the socket...
-            try: os.chmod(self.bind_addr, 0777)
-            except: pass
+            try:
+              os.chmod(self.bind_addr, 0777)
+            except IOError:
+              pass
             
             
             info = [(socket.AF_UNIX, socket.SOCK_STREAM, 0, "", self.bind_addr)]
             info = [(socket.AF_UNIX, socket.SOCK_STREAM, 0, "", self.bind_addr)]
         else:
         else:

+ 1 - 1
desktop/core/src/desktop/middleware_test.py

@@ -99,7 +99,7 @@ def test_audit_logging_middleware_enable():
     reset()
     reset()
     try:
     try:
       os.remove(log_tmp)
       os.remove(log_tmp)
-    except:
+    except OSError:
       pass
       pass
 
 
 def test_audit_logging_middleware_disable():
 def test_audit_logging_middleware_disable():

+ 4 - 4
desktop/core/src/desktop/supervisor.py

@@ -190,7 +190,7 @@ def shutdown(sups):
   for pid in CHILD_PIDS:
   for pid in CHILD_PIDS:
     try:
     try:
       os.kill(pid, signal.SIGINT)
       os.kill(pid, signal.SIGINT)
-    except:
+    except OSError:
       pass
       pass
 
 
   LOG.warn("Waiting for children to exit for %d seconds..." % WAIT_FOR_DEATH)
   LOG.warn("Waiting for children to exit for %d seconds..." % WAIT_FOR_DEATH)
@@ -209,7 +209,7 @@ def shutdown(sups):
     for pid in CHILD_PIDS:
     for pid in CHILD_PIDS:
       try:
       try:
         os.kill(pid, signal.SIGKILL)
         os.kill(pid, signal.SIGKILL)
-      except:
+      except OSError:
         pass
         pass
 
 
   sys.exit(1)
   sys.exit(1)
@@ -274,13 +274,13 @@ def drop_privileges():
 
 
   try:
   try:
     pw = pwd.getpwnam(SETUID_USER)
     pw = pwd.getpwnam(SETUID_USER)
-  except:
+  except KeyError:
     print >>sys.stderr, "[ERROR] Couldn't get user information for user " + SETUID_USER
     print >>sys.stderr, "[ERROR] Couldn't get user information for user " + SETUID_USER
     raise
     raise
 
 
   try:
   try:
     gr = grp.getgrnam(SETGID_GROUP)
     gr = grp.getgrnam(SETGID_GROUP)
-  except:
+  except KeyError:
     print >>sys.stderr, "[ERROR] Couldn't get group information for group " + SETGID_GROUP
     print >>sys.stderr, "[ERROR] Couldn't get group information for group " + SETGID_GROUP
     raise
     raise