Author: markt
Date: Tue Apr 17 10:55:07 2018
New Revision: 1829355
URL: http://svn.apache.org/viewvc?rev=1829355&view=rev
Log:
Improve debug logging of network and buffer reads.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1829355&r1=1829354&r2=1829355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Apr 17
10:55:07 2018
@@ -2389,9 +2389,15 @@ public class AprEndpoint extends Abstrac
if (to.isDirect() && to.remaining() >= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
+ if (log.isDebugEnabled()) {
+ log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+ }
} else {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
+ if (log.isDebugEnabled()) {
+ log.debug("Socket: [" + this + "], Read into buffer: [" +
nRead + "]");
+ }
// Fill as much of the remaining byte array as possible with
the
// data that was just read
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1829355&r1=1829354&r2=1829355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Tue
Apr 17 10:55:07 2018
@@ -120,7 +120,7 @@ channel.nio.ssl.invalidBuffer=You can on
channel.nio.ssl.expandNetInBuffer=Expanding network input buffer to [{0}] bytes
channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}]
bytes
channel.nio.ssl.sniDefault=Unable to buffer enough data to determine requested
SNI host name. Using default
-channel.nio.ssl.sniHostName=The SNI host name extracted for this connection
was [{0}]
+channel.nio.ssl.sniHostName=The SNI host name extracted for connection [{0}]
was [{1}]
channel.nio.ssl.foundHttp=Found an plain text HTTP request on what should be
an encrypted TLS connection
jsse.invalid_truststore_password=The provided trust store password could not
be used to unlock and/or validate the trust store. Retrying to access the trust
store with a null password which will skip validation.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1829355&r1=1829354&r2=1829355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Apr 17
10:55:07 2018
@@ -810,9 +810,15 @@ public class Nio2Endpoint extends Abstra
if (block && to.remaining() >= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
+ if (log.isDebugEnabled()) {
+ log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+ }
} else {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
+ if (log.isDebugEnabled()) {
+ log.debug("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
+ }
// Fill as much of the remaining byte array as possible
with the
// data that was just read
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1829355&r1=1829354&r2=1829355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Apr 17
10:55:07 2018
@@ -1105,10 +1105,16 @@ public class NioEndpoint extends Abstrac
if (to.remaining() >= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
+ if (log.isDebugEnabled()) {
+ log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+ }
updateLastRead();
} else {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
+ if (log.isDebugEnabled()) {
+ log.debug("Socket: [" + this + "], Read into buffer: [" +
nRead + "]");
+ }
updateLastRead();
// Fill as much of the remaining byte array as possible with
the
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1829355&r1=1829354&r2=1829355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Apr
17 10:55:07 2018
@@ -397,7 +397,7 @@ public class SecureNio2Channel extends N
}
if (log.isDebugEnabled()) {
- log.debug(sm.getString("channel.nio.ssl.sniHostName", hostName));
+ log.debug(sm.getString("channel.nio.ssl.sniHostName", sc,
hostName));
}
sslEngine = endpoint.createSSLEngine(hostName, clientRequestedCiphers,
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1829355&r1=1829354&r2=1829355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Tue Apr
17 10:55:07 2018
@@ -323,7 +323,7 @@ public class SecureNioChannel extends Ni
}
if (log.isDebugEnabled()) {
- log.debug(sm.getString("channel.nio.ssl.sniHostName", hostName));
+ log.debug(sm.getString("channel.nio.ssl.sniHostName", sc,
hostName));
}
sslEngine = endpoint.createSSLEngine(hostName, clientRequestedCiphers,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
