Merge lp:~cmiller/desktopcouch/retry-on-couchdb-death-bug530541 into lp:desktopcouch

[Chad Miller]

Add a retry loop around the code that tries to get the PID and use the PID to find the port of desktopcouch. It will retry nine more times now, sleeping one second between each attempt.

[Tim Cole (tcole)]

review: Approve

[Eric Casteleijn (thisfred)]

The code, it looks good.
The tests, they pass.

review: Approve

=== modified file 'desktopcouch/start_local_couchdb.py'
--- desktopcouch/start_local_couchdb.py	2010-03-18 19:42:55 +0000
+++ desktopcouch/start_local_couchdb.py	2010-04-13 00:37:14 +0000
@@ -244,7 +244,21 @@
 
 def start_couchdb(ctx=local_files.DEFAULT_CONTEXT):
     """Execute each step to start a desktop CouchDB."""
-    pid, port = run_couchdb(ctx=ctx)
+    pid = None
+    saved_exception = None
+    for retry in range(10):
+        try:
+            pid, port = run_couchdb(ctx=ctx)
+            break
+        except RuntimeError, e:
+            saved_exception = e
+            logging.exception("Starting couchdb failed on try %d" % (retry,))
+            time.sleep(1)
+            continue
+
+    if pid is None:
+        raise saved_exception
+
     # Note that we do not call update_design_documents here. This is because
     # Couch won't actually have started yet, so when update_design_documents
     # calls the Records API, that will call back into get_port and we end up