Author: markt Date: Thu Sep 10 13:43:38 2015 New Revision: 1702250 URL: http://svn.apache.org/r1702250 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58352 Always trigger a thread dump if Tomcat fails to stop gracefully even if using -force. Patch provided by Alexandre Garnier.
Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1702250&r1=1702249&r2=1702250&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Thu Sep 10 13:43:38 2015 @@ -480,10 +480,12 @@ elif [ "$1" = "stop" ] ; then sleep 1 fi if [ $SLEEP -eq 0 ]; then + echo "Tomcat did not stop in time." if [ $FORCE -eq 0 ]; then - echo "Tomcat did not stop in time. PID file was not removed. To aid diagnostics a thread dump has been written to standard out." - kill -3 `cat "$CATALINA_PID"` + echo "PID file was not removed." fi + echo "To aid diagnostics a thread dump has been written to standard out." + kill -3 `cat "$CATALINA_PID"` fi SLEEP=`expr $SLEEP - 1 ` done --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org