Author: markt
Date: Mon Aug 17 13:43:20 2009
New Revision: 804982
URL: http://svn.apache.org/viewvc?rev=804982&view=rev
Log:
Don't sleep if there is nothing to sleep for. Update the usage text.
Modified:
tomcat/trunk/bin/catalina.sh
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=804982&r1=804981&r2=804982&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Mon Aug 17 13:43:20 2009
@@ -357,10 +357,6 @@
fi
let SLEEP=SLEEP-1
done
- else
- if [ $? -eq 0 ]; then
- sleep $SLEEP
- fi
fi
if [ $FORCE -eq 1 ]; then
@@ -397,11 +393,12 @@
echo " run -security Start in the current window with security manager"
echo " start Start Catalina in a separate window"
echo " start -security Start in a separate window with security manager"
- echo " stop Stop Catalina"
- echo " stop n Stop Catalina, waiting n seconds for the process
to end"
- echo " stop -force Stop Catalina (followed by kill -KILL)"
- echo " stop n -force Stop Catalina, wait n seconds and then use kill
-KILL if still running"
+ echo " stop Stop Catalina, waiting up to 5 seconds for the
process to end"
+ echo " stop n Stop Catalina, waiting up to n seconds for the
process to end"
+ echo " stop -force Stop Catalina, wait up to 5 seconds and then use
kill -KILL if still running"
+ echo " stop n -force Stop Catalina, wait up to n seconds and then use
kill -KILL if still running"
echo " version What version of tomcat are you running?"
+ echo "Note: Waiting for the process to end and use of the -force option
require that \$CATALINA_PID is defined"
exit 1
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
