summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2008-08-27 21:24:48 +0000
committerRich Megginson <rmeggins@redhat.com>2008-08-27 21:24:48 +0000
commit27f282f02a60818e750902ecfd748ef3521f9539 (patch)
tree12ccf926b4e1bbfad5627c8e275bcc0cb9602f3d
parent41b1a8ff9d38c1c2e76461ac7da3721260419fdf (diff)
downloadds-27f282f02a60818e750902ecfd748ef3521f9539.tar.gz
ds-27f282f02a60818e750902ecfd748ef3521f9539.tar.xz
ds-27f282f02a60818e750902ecfd748ef3521f9539.zip
a couple of enhancements that make it easier to run the server under various debugging tools
-rw-r--r--ldap/admin/src/initconfig.in7
-rwxr-xr-xldap/admin/src/scripts/template-start-slapd.in4
2 files changed, 9 insertions, 2 deletions
diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in
index 12c0b8d9..9eef791e 100644
--- a/ldap/admin/src/initconfig.in
+++ b/ldap/admin/src/initconfig.in
@@ -31,3 +31,10 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
LD_PRELOAD_64=/usr/lib/64/libumem.so
export LD_PRELOAD_64
fi
+
+# how many seconds to wait for the startpid file to show
+# up before we assume there is a problem and fail to start
+#STARTPID_TIME=10 ; export STARTPID_TIME
+# how many seconds to wait for the pid file to show
+# up before we assume there is a problem and fail to start
+#PID_TIME=600 ; export PID_TIME
diff --git a/ldap/admin/src/scripts/template-start-slapd.in b/ldap/admin/src/scripts/template-start-slapd.in
index f2f70c5b..223d6ed1 100755
--- a/ldap/admin/src/scripts/template-start-slapd.in
+++ b/ldap/admin/src/scripts/template-start-slapd.in
@@ -47,7 +47,7 @@ fi
loop_counter=1
# wait for 10 seconds for the start pid file to appear
-max_count=10
+max_count=${STARTPID_TIME:-10}
while test $loop_counter -le $max_count; do
loop_counter=`expr $loop_counter + 1`
if test ! -f $STARTPIDFILE ; then
@@ -62,7 +62,7 @@ if test ! -f $STARTPIDFILE ; then
fi
loop_counter=1
# wait for 10 minutes (600 times 1 seconds)
-max_count=600
+max_count=${PID_TIME:-600}
while test $loop_counter -le $max_count; do
loop_counter=`expr $loop_counter + 1`
if test ! -f $PIDFILE ; then