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 2013/08/07 20:49:37 UTC
svn commit: r1511436 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.sh
webapps/docs/changelog.xml
Author: markt
Date: Wed Aug 7 18:49:37 2013
New Revision: 1511436
URL: http://svn.apache.org/r1511436
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45428
Trigger a thread dump to aid diagnostics if Tomcat fails to stop in a timely manner.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1511434
Modified: tomcat/tc7.0.x/trunk/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.sh?rev=1511436&r1=1511435&r2=1511436&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina.sh Wed Aug 7 18:49:37 2013
@@ -461,7 +461,8 @@ elif [ "$1" = "stop" ] ; then
fi
if [ $SLEEP -eq 0 ]; then
if [ $FORCE -eq 0 ]; then
- echo "Tomcat did not stop in time. PID file was not removed."
+ 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"`
fi
fi
SLEEP=`expr $SLEEP - 1 `
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1511436&r1=1511435&r2=1511436&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 7 18:49:37 2013
@@ -224,6 +224,11 @@
</subsection>
<subsection name="Other">
<changelog>
+ <add>
+ <bug>45428</bug>: Trigger a thread dump written to standard out if
+ Tomcat fails to stop in a timely manner to aid diagnostics. This is only
+ available on platforms that use <code>catalina.sh</code>. (markt)
+ </add>
<fix>
<bug>55204</bug>: Correct namespace used in Servlet 2.4 test web
application. Patch provided by Jeremy Boynes. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org