From 346169545592ddd8ac5cfede349012ce68a6020a Mon Sep 17 00:00:00 2001
From: Tim Freeman <tim@timfreeman.org>
Date: Tue, 8 Jun 2010 21:33:26 -0500
Subject: [PATCH] Fix for Bug 7030: nimbusctl should wait longer to check
 process

---
 home/sbin/nimbusconfigure.py | 1 +
 home/sbin/nimbusctl.py       | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/home/sbin/nimbusconfigure.py b/home/sbin/nimbusconfigure.py
index eccb22bd..0314b386 100755
--- a/home/sbin/nimbusconfigure.py
+++ b/home/sbin/nimbusconfigure.py
@@ -31,6 +31,7 @@
 keystore.pass: changeit
 
 services.enabled: True
+services.wait: 10
 web.enabled: False
 """
 CONFIG_STATE_PATH = 'nimbus-setup.conf'
diff --git a/home/sbin/nimbusctl.py b/home/sbin/nimbusctl.py
index 80389f07..d2b3d779 100755
--- a/home/sbin/nimbusctl.py
+++ b/home/sbin/nimbusctl.py
@@ -47,6 +47,11 @@
     sys.exit("Neither Nimbus services nor Nimbus web are enabled. "+
             "See the '%s' config file to adjust this setting." % CONFIG_PATH)
 
+try:
+    services_wait = config.getint('nimbussetup', 'services.wait')
+except ConfigParser.NoOptionError:
+    services_wait = 10
+
 NIMBUS_RUN_DIR = os.path.join(NIMBUS_HOME, 'var/run/')
 if not os.path.isdir(NIMBUS_RUN_DIR):
     try:
@@ -67,7 +72,7 @@
       program = NIMBUS_SERVICES_EXE,
       args = [],
       workingDir = NIMBUS_HOME,
-      postStartDelay=5
+      postStartDelay=services_wait
       ))
 
 if web_enabled: