From 21dc53169a29e607c4388e30625d7a7620906fc4 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 17 Aug 2009 13:43:20 +0000 Subject: [PATCH] Don't sleep if there is nothing to sleep for. Update the usage text. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@804982 13f79535-47bb-0310-9956-ffa450edef68 --- bin/catalina.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index e36528fdd..6c9b7b6fd 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -357,10 +357,6 @@ elif [ "$1" = "stop" ] ; then fi let SLEEP=SLEEP-1 done - else - if [ $? -eq 0 ]; then - sleep $SLEEP - fi fi if [ $FORCE -eq 1 ]; then @@ -397,11 +393,12 @@ else 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 -- 2.11.0