ovs.stream: Drop Stream.get_name() since clients can use 'name' directly.

[openvswitch] / python / ovs / daemon.py

diff --git a/python/ovs/daemon.py b/python/ovs/daemon.py
index 3d46deb750f5f518f44231ac1d75c54f9a1bee17..da7eb8aed99035b34b87183a2a70e5f8104c84ea 100644 (file)
--- a/python/ovs/daemon.py
+++ b/python/ovs/daemon.py
@@ -75,8 +75,7 @@ def set_pidfile(name):
 
 def get_pidfile():
     """Returns an absolute path to the configured pidfile, or None if no
-    pidfile is configured.  The caller must not modify or free the returned
-    string."""
+    pidfile is configured."""
     return _pidfile
 
 def set_no_chdir():
@@ -266,8 +265,7 @@ def _should_restart(status):
     if os.WIFSIGNALED(status):
         for signame in ("SIGABRT", "SIGALRM", "SIGBUS", "SIGFPE", "SIGILL",
                         "SIGPIPE", "SIGSEGV", "SIGXCPU", "SIGXFSZ"):
-            if (signame in signal.__dict__ and
-                os.WTERMSIG(status) == signal.__dict__[signame]):
+            if os.WTERMSIG(status) == getattr(signal, signame, None):
                 return True
     return False
 
@@ -424,10 +422,10 @@ def __read_pidfile(pidfile, delete_if_stale):
             logging.warning("%s: failed to delete stale pidfile"
                             % (pidfile, e.strerror))
             return -e.errno
-
-        logging.debug("%s: deleted stale pidfile" % pidfile)
-        file.close()
-        return 0
+        else:
+            logging.debug("%s: deleted stale pidfile" % pidfile)
+            file.close()
+            return 0
     except IOError, e:
         if e.errno not in [errno.EACCES, errno.EAGAIN]:
             logging.warn("%s: fcntl: %s" % (pidfile, e.strerror))