This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 1532c4f51c Differentiate trace and debug log levels 1532c4f51c is described below commit 1532c4f51c5cdaf603e984146c8391dcac1507b7 Author: remm <r...@apache.org> AuthorDate: Tue Feb 6 11:08:42 2024 +0100 Differentiate trace and debug log levels --- .../apache/tomcat/util/net/AbstractEndpoint.java | 8 ++-- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 40 ++++++++-------- java/org/apache/tomcat/util/net/NioEndpoint.java | 54 +++++++++++----------- .../apache/tomcat/util/net/SecureNio2Channel.java | 4 +- .../apache/tomcat/util/net/SecureNioChannel.java | 4 +- .../apache/tomcat/util/net/SocketWrapperBase.java | 8 ++-- .../tomcat/util/net/openssl/OpenSSLContext.java | 28 +++++------ .../util/net/openssl/panama/OpenSSLContext.java | 36 +++++++-------- .../util/net/openssl/panama/OpenSSLEngine.java | 12 ++--- 9 files changed, 97 insertions(+), 97 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java index 29cbef3b80..dfc0eb65f9 100644 --- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java +++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java @@ -1263,12 +1263,12 @@ public abstract class AbstractEndpoint<S,U> { // That causes delays when running the unit tests. Explicitly enableing linger but with a timeout of // zero seconds seems to fix the issue. s.setSoLinger(true, 0); - if (getLog().isDebugEnabled()) { - getLog().debug("About to unlock socket for:" + unlockAddress); + if (getLog().isTraceEnabled()) { + getLog().trace("About to unlock socket for:" + unlockAddress); } s.connect(unlockAddress,utmo); - if (getLog().isDebugEnabled()) { - getLog().debug("Socket unlock completed for:" + unlockAddress); + if (getLog().isTraceEnabled()) { + getLog().trace("Socket unlock completed for:" + unlockAddress); } } // Wait for up to 1000ms acceptor threads to unlock. Particularly diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 9a8d2fd134..8f831fd70e 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -611,8 +611,8 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy this.readCompletionHandler = new CompletionHandler<>() { @Override public void completed(Integer nBytes, ByteBuffer attachment) { - if (log.isDebugEnabled()) { - log.debug("Socket: [" + Nio2SocketWrapper.this + "], Interest: [" + readInterest + "]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + Nio2SocketWrapper.this + "], Interest: [" + readInterest + "]"); } boolean notify = false; synchronized (readCompletionHandler) { @@ -824,8 +824,8 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy public int read(boolean block, byte[] b, int off, int len) throws IOException { checkError(); - if (log.isDebugEnabled()) { - log.debug("Socket: [" + this + "], block: [" + block + "], length: [" + len + "]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + this + "], block: [" + block + "], length: [" + len + "]"); } if (socketBufferHandler == null) { @@ -846,8 +846,8 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy } } else { if (!readPending.tryAcquire()) { - if (log.isDebugEnabled()) { - log.debug("Socket: [" + this + "], Read in progress. Returning [0]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + this + "], Read in progress. Returning [0]"); } return 0; } @@ -880,8 +880,8 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy } else if (nRead == 0 && !block) { readInterest = true; } - if (log.isDebugEnabled()) { - log.debug("Socket: [" + this + "], Read: [" + nRead + "]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + this + "], Read: [" + nRead + "]"); } return nRead; } @@ -910,8 +910,8 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy } } else { if (!readPending.tryAcquire()) { - if (log.isDebugEnabled()) { - log.debug("Socket: [" + this + "], Read in progress. Returning [0]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + this + "], Read in progress. Returning [0]"); } return 0; } @@ -938,14 +938,14 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy 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 + "]"); + if (log.isTraceEnabled()) { + log.trace("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 + "]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + this + "], Read into buffer: [" + nRead + "]"); } // Fill as much of the remaining byte array as possible with the // data that was just read @@ -962,8 +962,8 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy @Override protected void doClose() { - if (log.isDebugEnabled()) { - log.debug("Calling [" + getEndpoint() + "].closeSocket([" + this + "])"); + if (log.isTraceEnabled()) { + log.trace("Calling [" + getEndpoint() + "].closeSocket([" + this + "])"); } try { getEndpoint().connections.remove(getSocket().getIOChannel()); @@ -1386,8 +1386,8 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy if (readNotify) { return; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("endpoint.debug.registerRead", this)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("endpoint.debug.registerRead", this)); } readInterest = true; if (readPending.tryAcquire()) { @@ -1416,8 +1416,8 @@ public class Nio2Endpoint extends AbstractNetworkChannelEndpoint<Nio2Channel,Asy if (writeNotify) { return; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("endpoint.debug.registerWrite", this)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("endpoint.debug.registerWrite", this)); } writeInterest = true; if (writePending.availablePermits() == 1) { diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 7cc0485170..666ad0dd47 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -342,8 +342,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke */ @Override public void unbind() throws Exception { - if (log.isDebugEnabled()) { - log.debug("Destroy initiated for " + + if (log.isTraceEnabled()) { + log.trace("Destroy initiated for " + new InetSocketAddress(getAddress(),getPortWithOffset())); } if (running) { @@ -359,8 +359,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke if (getHandler() != null ) { getHandler().recycle(); } - if (log.isDebugEnabled()) { - log.debug("Destroy completed for " + + if (log.isTraceEnabled()) { + log.trace("Destroy completed for " + new InetSocketAddress(getAddress(), getPortWithOffset())); } } @@ -907,8 +907,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke } } if (sd.length <= 0 && sc.getOutboundRemaining()<=0) { - if (log.isDebugEnabled()) { - log.debug("Send file complete for: " + sd.fileName); + if (log.isTraceEnabled()) { + log.trace("Send file complete for: " + sd.fileName); } socketWrapper.setSendfileData(null); try { @@ -921,15 +921,15 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke if (!calledByProcessor) { switch (sd.keepAliveState) { case NONE: { - if (log.isDebugEnabled()) { - log.debug("Send file connection is being closed"); + if (log.isTraceEnabled()) { + log.trace("Send file connection is being closed"); } socketWrapper.close(); break; } case PIPELINED: { - if (log.isDebugEnabled()) { - log.debug("Connection is keep alive, processing pipe-lined data"); + if (log.isTraceEnabled()) { + log.trace("Connection is keep alive, processing pipe-lined data"); } if (!processSocket(socketWrapper, SocketEvent.OPEN_READ, true)) { socketWrapper.close(); @@ -937,8 +937,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke break; } case OPEN: { - if (log.isDebugEnabled()) { - log.debug("Connection is keep alive, registering back for OP_READ"); + if (log.isTraceEnabled()) { + log.trace("Connection is keep alive, registering back for OP_READ"); } reg(sk, socketWrapper, SelectionKey.OP_READ); break; @@ -947,8 +947,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke } return SendfileState.DONE; } else { - if (log.isDebugEnabled()) { - log.debug("OP_WRITE for sendfile: " + sd.fileName); + if (log.isTraceEnabled()) { + log.trace("OP_WRITE for sendfile: " + sd.fileName); } if (calledByProcessor) { add(socketWrapper, SelectionKey.OP_WRITE); @@ -959,7 +959,7 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke } } catch (IOException e) { if (log.isDebugEnabled()) { - log.debug("Unable to complete sendfile request:", e); + log.debug(sm.getString("endpoint.sendfile.error"), e); } if (!calledByProcessor && sc != null) { socketWrapper.close(); @@ -1187,15 +1187,15 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke 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 + "]"); + if (log.isTraceEnabled()) { + log.trace("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 + "]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + this + "], Read into buffer: [" + nRead + "]"); } updateLastRead(); @@ -1211,8 +1211,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke @Override protected void doClose() { - if (log.isDebugEnabled()) { - log.debug("Calling [" + getEndpoint() + "].closeSocket([" + this + "])"); + if (log.isTraceEnabled()) { + log.trace("Calling [" + getEndpoint() + "].closeSocket([" + this + "])"); } try { getEndpoint().connections.remove(getSocket().getIOChannel()); @@ -1426,8 +1426,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke @Override public void registerReadInterest() { - if (log.isDebugEnabled()) { - log.debug(sm.getString("endpoint.debug.registerRead", this)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("endpoint.debug.registerRead", this)); } getPoller().add(this, SelectionKey.OP_READ); } @@ -1435,8 +1435,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke @Override public void registerWriteInterest() { - if (log.isDebugEnabled()) { - log.debug(sm.getString("endpoint.debug.registerWrite", this)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("endpoint.debug.registerWrite", this)); } getPoller().add(this, SelectionKey.OP_WRITE); } @@ -1599,8 +1599,8 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint<NioChannel,Socke if (!completionDone) { // This filters out same notification until processing // of the current one is done - if (log.isDebugEnabled()) { - log.debug("Skip concurrent " + (read ? "read" : "write") + " notification"); + if (log.isTraceEnabled()) { + log.trace("Skip concurrent " + (read ? "read" : "write") + " notification"); } return; } diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java b/java/org/apache/tomcat/util/net/SecureNio2Channel.java index d7edbd7afa..92b5f3d5c4 100644 --- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java +++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java @@ -429,8 +429,8 @@ public class SecureNio2Channel extends Nio2Channel { throw new IOException(sm.getString("channel.nio.ssl.foundHttp")); } - if (log.isDebugEnabled()) { - log.debug(sm.getString("channel.nio.ssl.sniHostName", sc, hostName)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("channel.nio.ssl.sniHostName", sc, hostName)); } createSSLEngine(hostName, clientRequestedCiphers, diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java b/java/org/apache/tomcat/util/net/SecureNioChannel.java index 36912dbe52..768ec458f1 100644 --- a/java/org/apache/tomcat/util/net/SecureNioChannel.java +++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java @@ -299,8 +299,8 @@ public class SecureNioChannel extends NioChannel { throw new IOException(sm.getString("channel.nio.ssl.foundHttp")); } - if (log.isDebugEnabled()) { - log.debug(sm.getString("channel.nio.ssl.sniHostName", sc, hostName)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("channel.nio.ssl.sniHostName", sc, hostName)); } createSSLEngine(hostName, clientRequestedCiphers, diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/java/org/apache/tomcat/util/net/SocketWrapperBase.java index 1216bd7a3a..1a7bf2655f 100644 --- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java +++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java @@ -368,8 +368,8 @@ public abstract class SocketWrapperBase<E> { remaining = Math.min(remaining, len); readBuffer.get(b, off, remaining); - if (log.isDebugEnabled()) { - log.debug("Socket: [" + this + "], Read from buffer: [" + remaining + "]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + this + "], Read from buffer: [" + remaining + "]"); } } return remaining; @@ -382,8 +382,8 @@ public abstract class SocketWrapperBase<E> { socketBufferHandler.configureReadBufferForRead(); int nRead = transfer(socketBufferHandler.getReadBuffer(), to); - if (log.isDebugEnabled()) { - log.debug("Socket: [" + this + "], Read from buffer: [" + nRead + "]"); + if (log.isTraceEnabled()) { + log.trace("Socket: [" + this + "], Read from buffer: [" + nRead + "]"); } return nRead; } diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java index 11f15589e5..f1d7b092ec 100644 --- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java +++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java @@ -104,8 +104,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { OpenSSLConf openSslConf = sslHostConfig.getOpenSslConf(); if (openSslConf != null) { try { - if (log.isDebugEnabled()) { - log.debug(sm.getString("openssl.makeConf")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("openssl.makeConf")); } cctx = SSLConf.make(aprPool, SSL.SSL_CONF_FLAG_FILE | @@ -212,8 +212,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { result = false; continue; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("opensslconf.checkCommand", name, value)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("opensslconf.checkCommand", name, value)); } try { rc = SSLConf.check(cctx, name, value); @@ -225,8 +225,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { log.error(sm.getString("opensslconf.failedCommand", name, value, Integer.toString(rc))); result = false; - } else if (log.isDebugEnabled()) { - log.debug(sm.getString("opensslconf.resultCommand", name, value, + } else if (log.isTraceEnabled()) { + log.trace(sm.getString("opensslconf.resultCommand", name, value, Integer.toString(rc))); } } @@ -252,8 +252,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { result = false; continue; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("opensslconf.applyCommand", name, value)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("opensslconf.applyCommand", name, value)); } try { rc = SSLConf.apply(cctx, name, value); @@ -265,8 +265,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { log.error(sm.getString("opensslconf.failedCommand", name, value, Integer.toString(rc))); result = false; - } else if (log.isDebugEnabled()) { - log.debug(sm.getString("opensslconf.resultCommand", name, value, + } else if (log.isTraceEnabled()) { + log.trace(sm.getString("opensslconf.resultCommand", name, value, Integer.toString(rc))); } } @@ -397,8 +397,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { OpenSSLConf openSslConf = sslHostConfig.getOpenSslConf(); if (openSslConf != null && state.cctx != 0) { // Check OpenSSLConfCmd if used - if (log.isDebugEnabled()) { - log.debug(sm.getString("openssl.checkConf")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("openssl.checkConf")); } try { if (!checkConf(openSslConf, state.cctx)) { @@ -408,8 +408,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { } catch (Exception e) { throw new Exception(sm.getString("openssl.errCheckConf"), e); } - if (log.isDebugEnabled()) { - log.debug(sm.getString("openssl.applyConf")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("openssl.applyConf")); } try { if (!applyConf(openSslConf, state.cctx, state.ctx)) { diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java index 76e97a5705..e01e55da5b 100644 --- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java +++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java @@ -174,8 +174,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { // Create OpenSSLConfCmd context if used OpenSSLConf openSslConf = sslHostConfig.getOpenSslConf(); if (openSslConf != null) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("openssl.makeConf")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("openssl.makeConf")); } confCtx = SSL_CONF_CTX_new(); if (MemorySegment.NULL.equals(confCtx)) { @@ -335,8 +335,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { result = false; continue; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("opensslconf.checkCommand", name, value)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("opensslconf.checkCommand", name, value)); } try (var localArena = Arena.ofConfined()) { if (name.equals("NO_OCSP_CHECK")) { @@ -378,8 +378,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { log.error(sm.getString("opensslconf.failedCommand", name, value, Integer.toString(rc))); result = false; - } else if (log.isDebugEnabled()) { - log.debug(sm.getString("opensslconf.resultCommand", name, value, + } else if (log.isTraceEnabled()) { + log.trace(sm.getString("opensslconf.resultCommand", name, value, Integer.toString(rc))); } } @@ -406,8 +406,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { result = false; continue; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("opensslconf.applyCommand", name, value)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("opensslconf.applyCommand", name, value)); } try (var localArena = Arena.ofConfined()) { if (name.equals("NO_OCSP_CHECK")) { @@ -430,8 +430,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { log.error(sm.getString("opensslconf.failedCommand", name, value, Integer.toString(rc))); result = false; - } else if (log.isDebugEnabled()) { - log.debug(sm.getString("opensslconf.resultCommand", name, value, + } else if (log.isTraceEnabled()) { + log.trace(sm.getString("opensslconf.resultCommand", name, value, Integer.toString(rc))); } } @@ -596,8 +596,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { OpenSSLConf openSslConf = sslHostConfig.getOpenSslConf(); if (openSslConf != null && !MemorySegment.NULL.equals(state.confCtx)) { // Check OpenSSLConfCmd if used - if (log.isDebugEnabled()) { - log.debug(sm.getString("openssl.checkConf")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("openssl.checkConf")); } try { if (!checkConf(openSslConf)) { @@ -606,8 +606,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { } catch (Exception e) { log.error(sm.getString("openssl.errCheckConf"), e); } - if (log.isDebugEnabled()) { - log.debug(sm.getString("openssl.applyConf")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("openssl.applyConf")); } try { if (!applyConf(openSslConf)) { @@ -744,8 +744,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { } @Override public int apply(MemorySegment /*X509_STORE_CTX*/ x509_ctx, MemorySegment param) { - if (log.isDebugEnabled()) { - log.debug("Certificate verification"); + if (log.isTraceEnabled()) { + log.trace("Certificate verification"); } if (MemorySegment.NULL.equals(param)) { return 0; @@ -872,8 +872,8 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { } @Override public int apply(MemorySegment /* char **/ buf, int bufsiz, int verify, MemorySegment /* void **/ cb) { - if (log.isDebugEnabled()) { - log.debug("Return password for certificate"); + if (log.isTraceEnabled()) { + log.trace("Return password for certificate"); } if (callbackPassword != null && callbackPassword.length() > 0) { try (var localArena = Arena.ofConfined()) { diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java index 2b4b2bc4d5..39874a5011 100644 --- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java +++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java @@ -891,8 +891,8 @@ public final class OpenSSLEngine extends SSLEngine implements SSLUtil.ProtocolIn } MemorySegment protocolAddress = protocolPointer.get(ValueLayout.ADDRESS, 0); byte[] name = protocolAddress.reinterpret(length, localArena, null).toArray(ValueLayout.JAVA_BYTE); - if (log.isDebugEnabled()) { - log.debug("Protocol negotiated [" + new String(name) + "]"); + if (log.isTraceEnabled()) { + log.trace("Protocol negotiated [" + new String(name) + "]"); } return new String(name); } @@ -921,8 +921,8 @@ public final class OpenSSLEngine extends SSLEngine implements SSLUtil.ProtocolIn } private void renegotiate() throws SSLException { - if (log.isDebugEnabled()) { - log.debug("Start renegotiate"); + if (log.isTraceEnabled()) { + log.trace("Start renegotiate"); } clearLastError(); int code; @@ -1132,8 +1132,8 @@ public final class OpenSSLEngine extends SSLEngine implements SSLUtil.ProtocolIn log.warn(sm.getString("engine.noSSL", Long.valueOf(ssl.address()))); return 0; } - if (log.isDebugEnabled()) { - log.debug("Verification in engine with mode [" + state.certificateVerifyMode + "] for " + state.ssl); + if (log.isTraceEnabled()) { + log.trace("Verification in engine with mode [" + state.certificateVerifyMode + "] for " + state.ssl); } int ok = preverify_ok; int errnum = X509_STORE_CTX_get_error(x509ctx); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org