You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/01/13 16:39:47 UTC

svn commit: r1557752 - /tomcat/trunk/bin/catalina.sh

Author: markt
Date: Mon Jan 13 15:39:47 2014
New Revision: 1557752

URL: http://svn.apache.org/r1557752
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=55986
Ensure that if Tomcat is stopped via "kill -9 <PID>" that the script doesn't falsely report that it is still running.
Based on a patch by jess.

Modified:
    tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1557752&r1=1557751&r2=1557752&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Mon Jan 13 15:39:47 2014
@@ -514,11 +514,12 @@ elif [ "$1" = "stop" ] ; then
                     if [ -w "$CATALINA_PID" ]; then
                         cat /dev/null > "$CATALINA_PID"
                     else
-                        echo "Tomcat was killed but the PID file could not be removed."
+                        echo "The PID file could not be removed."
                     fi
-                    # Set this to zero else a warning will be issued about the process still running
-                    KILL_SLEEP_INTERVAL=0
                 fi
+                # Set this to zero else a warning will be issued about the process still running
+                KILL_SLEEP_INTERVAL=0
+                echo "The Tomcat process has been killed."
                 break
             fi
             if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org