[Erp5-report] r42205 kazuhiko - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Jan 11 15:36:58 2011
New Revision: 42205

URL: http://svn.erp5.org?rev=42205&view=rev
Log:
* if pid is None, waitStartDaemon immediately returns False.
* wait 1 second after checking instead of before checking.

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py?rev=42205&r1=42204&r2=42205&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py [utf8] Tue Jan 11 15:36:58 2011
@@ -57,18 +57,20 @@ def socketStatus(hostname, port):
 def waitStartDaemon(daemon, attempts):
   """Wait a certain time to start the daemon."""
   for num in range(attempts):
-    sleep(1)
     if daemon.status():
       return True
+    elif daemon.pid() is None:
+      return False
+    sleep(1)
   return False
 
 
 def waitStopDaemon(daemon, attempts=5):
   """Wait a certain time to stop the daemon."""
   for num in range(attempts):
-    sleep(1)
     if not daemon.status():
       return True
+    sleep(1)
   return False