Fix for Bug 7030: nimbusctl should wait longer to check process

nimbusproject · Jun 9, 2010 · 3461695 · 3461695
1 parent 925f35f
commit 3461695
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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: