Author: markt
Date: Wed Mar 28 20:39:13 2012
New Revision: 1306586
URL: http://svn.apache.org/viewvc?rev=1306586&view=rev
Log:
When using automatic ports, include the port number in the name used in logging
if we know it.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1306556
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1306586&r1=1306585&r2=1306586&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Mar
28 20:39:13 2012
@@ -263,9 +263,14 @@ public abstract class AbstractProtocol i
}
int port = getPort();
if (port == 0) {
- // auto binding is in use so port is unknown at this point
+ // Auto binding is in use. Check if port is known
name.append("auto-");
name.append(getNameIndex());
+ port = getLocalPort();
+ if (port != -1) {
+ name.append('-');
+ name.append(port);
+ }
} else {
name.append(port);
}
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=1306586&r1=1306585&r2=1306586&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Mar 28 20:39:13 2012
@@ -173,6 +173,10 @@
<bug>52926</bug>: Avoid NPE when an NIO Comet connection times out on
one thread at the same time as it is closed on another thread. (markt)
</fix>
+ <add>
+ Include port number when known in connector name when loggin messages
+ from connectors that use automatic free port allocation. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
