Merge lp:~ken-vandine/desktopcouch/desktopcouch-408796 into lp:desktopcouch

[Ken VanDine]

  Handle the case where the pid file is empty or doesn't exist (LP: #408796)

[Ken VanDine (ken-vandine)]

  Handle the case where the pid file is empty or doesn't exist (LP: #408796)

[Elliot Murphy (statik)]

reviewed and tested locally.

review: Approve

=== modified file 'desktopcouch/__init__.py'
--- desktopcouch/__init__.py	2009-07-28 17:56:10 +0000
+++ desktopcouch/__init__.py	2009-08-04 11:15:52 +0000
@@ -24,19 +24,21 @@
 def find_pid():
     # Work out whether CouchDB is running by looking at its pid file
     from desktopcouch import local_files
-    fp = open(local_files.FILE_PID)
-    pid = int(fp.read())
-    fp.close()
+    pid = ''
     try:
-        os.kill(pid, 0)
-    except os.error, detail:
-        if detail.errno == errno.ESRCH:
-            # pidfile is stale
-            # start CouchDB by running the startup script
-            print "Desktop CouchDB is not running; starting it."
-            from desktopcouch import start_local_couchdb
-            start_local_couchdb.start_couchdb()
-            time.sleep(2) # give the process a chance to start
+        fp = open(local_files.FILE_PID)
+        pid = int(fp.read())
+        fp.close()
+    except IOError:
+        pass
+
+    if not is_couchdb(pid):
+        # pidfile is stale
+        # start CouchDB by running the startup script
+        print "Desktop CouchDB is not running; starting it."
+        from desktopcouch import start_local_couchdb
+        start_local_couchdb.start_couchdb()
+        time.sleep(2) # give the process a chance to start
 
     # get the pid
     try:
@@ -49,24 +51,29 @@
             raise
     return pid
 
-def find_port(pid):
-    # Look in the CouchDB log to find the port number, someday.
-    # Currently, we have to grovel around in /proc instead.
-    # Oh, the huge manatee... (this replaced an lsof shell recipe
-    # which was shorter but less reliable)
-
+def is_couchdb(pid):
     proc_dir = "/proc/%s" % (pid,)
 
     # check to make sure that the process still exists
     if not os.path.isdir(proc_dir):
-        raise RuntimeError("Stale PID file or desktop-couch crashed")
+        return False
 
     # check to make sure it is actually a desktop-couch instance
     with open(os.path.join(proc_dir, 'cmdline')) as cmd_file:
         cmd = cmd_file.read()
     if re.search('desktop-couch', cmd) is None:
-        raise RuntimeError("Stale PID file")
-
+        return False
+
+    return True
+
+def find_port(pid):
+    # Look in the CouchDB log to find the port number, someday.
+    # Currently, we have to grovel around in /proc instead.
+    # Oh, the huge manatee... (this replaced an lsof shell recipe
+    # which was shorter but less reliable)
+
+    proc_dir = "/proc/%s" % (pid,)
+    
     # enumerate the process' file descriptors
     fd_dir = os.path.join(proc_dir, 'fd')
     fd_paths = [os.readlink(os.path.join(fd_dir, fd))