[tomcat] branch master updated: 63879: Remove stack trace from debug logging on socket wrapper close

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 6bc2615  63879: Remove stack trace from debug logging on socket 
wrapper close
6bc2615 is described below

commit 6bc2615e2a05647e92816f6a52be8bbd5d82cb23
Author: remm <r...@apache.org>
AuthorDate: Tue Oct 29 09:27:00 2019 +0100

    63879: Remove stack trace from debug logging on socket wrapper close
    
    In most cases this was really too much. Keep the overall verbosity of
    the endpoint logging unchanged, however.
---
 java/org/apache/tomcat/util/net/AprEndpoint.java  | 2 +-
 java/org/apache/tomcat/util/net/Nio2Endpoint.java | 2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 2 +-
 webapps/docs/changelog.xml                        | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 8c0d484..997c01a 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2242,7 +2242,7 @@ public class AprEndpoint extends 
AbstractEndpoint<Long,Long> implements SNICallB
         @Override
         protected void doClose() {
             if (log.isDebugEnabled()) {
-                log.debug("Calling [" + getEndpoint() + "].closeSocket([" + 
this + "])", new Exception());
+                log.debug("Calling [" + getEndpoint() + "].closeSocket([" + 
this + "])");
             }
             socketBufferHandler = SocketBufferHandler.EMPTY;
             nonBlockingWriteBuffer.clear();
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index e61215b..3fe951c 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -912,7 +912,7 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
         @Override
         protected void doClose() {
             if (log.isDebugEnabled()) {
-                log.debug("Calling [" + getEndpoint() + "].closeSocket([" + 
this + "])", new Exception());
+                log.debug("Calling [" + getEndpoint() + "].closeSocket([" + 
this + "])");
             }
             try {
                 synchronized (getSocket()) {
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 84b3003..f62607b 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1160,7 +1160,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint<NioChannel,SocketChannel>
         @Override
         protected void doClose() {
             if (log.isDebugEnabled()) {
-                log.debug("Calling [" + getEndpoint() + "].closeSocket([" + 
this + "])", new Exception());
+                log.debug("Calling [" + getEndpoint() + "].closeSocket([" + 
this + "])");
             }
             try {
                 synchronized (getSocket()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6a1ed28..3c36184 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -96,6 +96,10 @@
         and pass through <code>None</code> value if set by user. Patch provided
         by John Kelly. (markt)
       </fix>
+      <fix>
+        <bug>63879</bug>: Remove stack trace from debug logging on socket
+        wrapper close. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">


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