This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new cee5ebb0fe Differentiate trace and debug log levels
cee5ebb0fe is described below
commit cee5ebb0fe10bd9a086148f157dda2ad0454aae3
Author: remm <r...@apache.org>
AuthorDate: Mon Feb 5 15:22:59 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/AbstractProcessorLight.java | 12 +--
java/org/apache/coyote/AbstractProtocol.java | 44 +++++-----
java/org/apache/coyote/AsyncStateMachine.java | 12 +--
java/org/apache/coyote/ajp/AjpMessage.java | 14 ++--
.../coyote/http11/filters/GzipOutputFilter.java | 4 +-
.../http11/upgrade/UpgradeProcessorExternal.java | 8 +-
java/org/apache/coyote/http2/AbstractStream.java | 12 +--
.../coyote/http2/ConnectionSettingsBase.java | 4 +-
java/org/apache/coyote/http2/HpackDecoder.java | 20 ++---
java/org/apache/coyote/http2/HpackEncoder.java | 4 +-
.../coyote/http2/Http2AsyncUpgradeHandler.java | 32 ++++----
java/org/apache/coyote/http2/Http2Parser.java | 24 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 94 +++++++++++-----------
java/org/apache/coyote/http2/Stream.java | 40 ++++-----
java/org/apache/coyote/http2/StreamProcessor.java | 4 +-
.../apache/coyote/http2/StreamStateMachine.java | 4 +-
webapps/docs/changelog.xml | 5 ++
18 files changed, 173 insertions(+), 168 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index b9f5860fd7..44439a668e 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -265,8 +265,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
state = dispatchEndRequest();
}
- if (getLog().isDebugEnabled()) {
- getLog().debug("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
+ if (getLog().isTraceEnabled()) {
+ getLog().trace("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
return state;
diff --git a/java/org/apache/coyote/AbstractProcessorLight.java
b/java/org/apache/coyote/AbstractProcessorLight.java
index fdd0d194fe..8948f145e2 100644
--- a/java/org/apache/coyote/AbstractProcessorLight.java
+++ b/java/org/apache/coyote/AbstractProcessorLight.java
@@ -44,8 +44,8 @@ public abstract class AbstractProcessorLight implements
Processor {
do {
if (dispatches != null) {
DispatchType nextDispatch = dispatches.next();
- if (getLog().isDebugEnabled()) {
- getLog().debug("Processing dispatch type: [" +
nextDispatch + "]");
+ if (getLog().isTraceEnabled()) {
+ getLog().trace("Processing dispatch type: [" +
nextDispatch + "]");
}
state = dispatch(nextDispatch.getSocketStatus());
if (!dispatches.hasNext()) {
@@ -69,8 +69,8 @@ public abstract class AbstractProcessorLight implements
Processor {
state = SocketState.CLOSED;
}
- if (getLog().isDebugEnabled()) {
- getLog().debug(
+ if (getLog().isTraceEnabled()) {
+ getLog().trace(
"Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
@@ -81,8 +81,8 @@ public abstract class AbstractProcessorLight implements
Processor {
*/
if (isAsync() && state != SocketState.CLOSED) {
state = asyncPostProcess();
- if (getLog().isDebugEnabled()) {
- getLog().debug(
+ if (getLog().isTraceEnabled()) {
+ getLog().trace(
"Socket: [" + socketWrapper + "], State after
async post processing: [" + state + "]");
}
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index fb60024311..3a05b01dcf 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -428,16 +428,16 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
public void addWaitingProcessor(Processor processor) {
- if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
+ if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
}
waitingProcessors.add(processor);
}
public void removeWaitingProcessor(Processor processor) {
- if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.remove",
processor));
+ if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractProtocol.waitingProcessor.remove",
processor));
}
waitingProcessors.remove(processor);
}
@@ -801,8 +801,8 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
@Override
public SocketState process(SocketWrapperBase<S> wrapper, SocketEvent
status) {
- if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractConnectionHandler.process",
wrapper.getSocket(), status));
+ if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractConnectionHandler.process",
wrapper.getSocket(), status));
}
if (wrapper == null) {
// Nothing to do. Socket has been closed.
@@ -816,8 +816,8 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
// held by this variable will be associated with the SocketWrapper
before this
// method returns.
Processor processor = (Processor) wrapper.takeCurrentProcessor();
- if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractConnectionHandler.connectionsGet",
processor, socket));
+ if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractConnectionHandler.connectionsGet",
processor, socket));
}
// Timeouts are calculated on a dedicated thread and then
@@ -848,8 +848,8 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
UpgradeProtocol upgradeProtocol =
getProtocol().getNegotiatedProtocol(negotiatedProtocol);
if (upgradeProtocol != null) {
processor = upgradeProtocol.getProcessor(wrapper,
getProtocol().getAdapter());
- if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractConnectionHandler.processorCreate",
processor));
+ if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractConnectionHandler.processorCreate",
processor));
}
} else if (negotiatedProtocol.equals("http/1.1")) {
// Explicitly negotiated the default protocol.
@@ -877,15 +877,15 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
}
if (processor == null) {
processor = recycledProcessors.pop();
- if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractConnectionHandler.processorPop",
processor));
+ if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractConnectionHandler.processorPop",
processor));
}
}
if (processor == null) {
processor = getProtocol().createProcessor();
register(processor);
- if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractConnectionHandler.processorCreate",
processor));
+ if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractConnectionHandler.processorCreate",
processor));
}
}
@@ -924,8 +924,8 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
release(processor);
// Create the upgrade processor
processor =
getProtocol().createUpgradeProcessor(wrapper, upgradeToken);
- if (getLog().isDebugEnabled()) {
- getLog().debug(
+ if (getLog().isTraceEnabled()) {
+ getLog().trace(
sm.getString("abstractConnectionHandler.upgradeCreate", processor, wrapper));
}
// Initialise the upgrade handler (which may
trigger
@@ -1099,8 +1099,8 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
// recycledProcessors since that pool is only for AJP or
// HTTP processors
recycledProcessors.push(processor);
- if (getLog().isDebugEnabled()) {
- getLog().debug("Pushed Processor [" + processor + "]");
+ if (getLog().isTraceEnabled()) {
+ getLog().trace("Pushed Processor [" + processor + "]");
}
}
}
@@ -1127,8 +1127,8 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
ObjectName rpName = new ObjectName(
getProtocol().getDomain() +
":type=RequestProcessor,worker=" + getProtocol().getName() +
",name=" +
getProtocol().getProtocolName() + "Request" + count);
- if (getLog().isDebugEnabled()) {
- getLog().debug("Register [" + processor + "] as ["
+ rpName + "]");
+ if (getLog().isTraceEnabled()) {
+ getLog().trace("Register [" + processor + "] as ["
+ rpName + "]");
}
Registry.getRegistry(null, null).registerComponent(rp,
rpName, null);
rp.setRpName(rpName);
@@ -1151,8 +1151,8 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
RequestInfo rp = r.getRequestProcessor();
rp.setGlobalProcessor(null);
ObjectName rpName = rp.getRpName();
- if (getLog().isDebugEnabled()) {
- getLog().debug("Unregister [" + rpName + "]");
+ if (getLog().isTraceEnabled()) {
+ getLog().trace("Unregister [" + rpName + "]");
}
Registry.getRegistry(null,
null).unregisterComponent(rpName);
rp.setRpName(null);
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index b5e5193d59..465971acef 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -421,8 +421,8 @@ class AsyncStateMachine {
Request request = processor.getRequest();
boolean containerThread = (request != null &&
request.isRequestThread());
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("asyncStateMachine.asyncError.start"));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("asyncStateMachine.asyncError.start"));
}
clearNonBlockingListeners();
@@ -430,8 +430,8 @@ class AsyncStateMachine {
updateState(AsyncState.MUST_ERROR);
} else {
if (hasProcessedError) {
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("asyncStateMachine.asyncError.skip"));
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("asyncStateMachine.asyncError.skip"));
}
return false;
}
@@ -521,8 +521,8 @@ class AsyncStateMachine {
private synchronized void updateState(AsyncState newState) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("asyncStateMachine.stateChange", state,
newState));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("asyncStateMachine.stateChange", state,
newState));
}
state = newState;
}
diff --git a/java/org/apache/coyote/ajp/AjpMessage.java
b/java/org/apache/coyote/ajp/AjpMessage.java
index 1e4f0c6f3e..c20f4a26c5 100644
--- a/java/org/apache/coyote/ajp/AjpMessage.java
+++ b/java/org/apache/coyote/ajp/AjpMessage.java
@@ -333,21 +333,21 @@ public class AjpMessage {
// Verify message signature
if ((toContainer && mark != 0x1234) || (!toContainer && mark !=
0x4142)) {
log.error(sm.getString("ajpmessage.invalid", "" + mark));
- if (log.isDebugEnabled()) {
+ if (log.isTraceEnabled()) {
dump("In");
}
return -1;
}
- if (log.isDebugEnabled()) {
- log.debug("Received " + len + " " + buf[0]);
+ if (log.isTraceEnabled()) {
+ log.trace("Received " + len + " " + buf[0]);
}
return len;
}
private void dump(String prefix) {
- if (log.isDebugEnabled()) {
- log.debug(prefix + ": " + HexUtils.toHexString(buf) + " " + pos +
"/" + (len + 4));
+ if (log.isTraceEnabled()) {
+ log.trace(prefix + ": " + HexUtils.toHexString(buf) + " " + pos +
"/" + (len + 4));
}
int max = pos;
if (len + 4 > pos) {
@@ -356,9 +356,9 @@ public class AjpMessage {
if (max > 1000) {
max = 1000;
}
- if (log.isDebugEnabled()) {
+ if (log.isTraceEnabled()) {
for (int j = 0; j < max; j += 16) {
- log.debug(hexLine(buf, j, len));
+ log.trace(hexLine(buf, j, len));
}
}
}
diff --git a/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
b/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
index 39fa1fd63c..29c4b15f97 100644
--- a/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
+++ b/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
@@ -92,8 +92,8 @@ public class GzipOutputFilter implements OutputFilter {
public void flush() throws IOException {
if (compressionStream != null) {
try {
- if (log.isDebugEnabled()) {
- log.debug("Flushing the compression stream!");
+ if (log.isTraceEnabled()) {
+ log.trace("Flushing the compression stream!");
}
compressionStream.flush();
} catch (IOException e) {
diff --git
a/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
b/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
index 0c519bd488..f2cdf95650 100644
--- a/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
+++ b/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
@@ -96,8 +96,8 @@ public class UpgradeProcessorExternal extends
UpgradeProcessorBase {
} else if (status == SocketEvent.OPEN_WRITE) {
upgradeServletOutputStream.onWritePossible();
} else if (status == SocketEvent.STOP) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeProcessor.stop"));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeProcessor.stop"));
}
try {
upgradeServletInputStream.close();
@@ -119,8 +119,8 @@ public class UpgradeProcessorExternal extends
UpgradeProcessorBase {
}
if (upgradeServletInputStream.isClosed() &&
upgradeServletOutputStream.isClosed()) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeProcessor.requiredClose",
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeProcessor.requiredClose",
Boolean.valueOf(upgradeServletInputStream.isClosed()),
Boolean.valueOf(upgradeServletOutputStream.isClosed())));
}
diff --git a/java/org/apache/coyote/http2/AbstractStream.java
b/java/org/apache/coyote/http2/AbstractStream.java
index d6fb8d8280..367e764232 100644
--- a/java/org/apache/coyote/http2/AbstractStream.java
+++ b/java/org/apache/coyote/http2/AbstractStream.java
@@ -100,8 +100,8 @@ abstract class AbstractStream {
// goes beyond 2^31-1 an error is triggered.
windowSize += increment;
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("abstractStream.windowSizeInc",
getConnectionId(), getIdAsString(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("abstractStream.windowSizeInc",
getConnectionId(), getIdAsString(),
Integer.toString(increment),
Long.toString(windowSize)));
}
@@ -127,8 +127,8 @@ abstract class AbstractStream {
// the Integer.MAX_VALUE and once windowSize goes negative no
further
// decrements are permitted
windowSize -= decrement;
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("abstractStream.windowSizeDec",
getConnectionId(), getIdAsString(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("abstractStream.windowSizeDec",
getConnectionId(), getIdAsString(),
Integer.toString(decrement),
Long.toString(windowSize)));
}
} finally {
@@ -143,7 +143,7 @@ abstract class AbstractStream {
final void setConnectionAllocationRequested(int
connectionAllocationRequested) {
-
log.debug(sm.getString("abstractStream.setConnectionAllocationRequested",
getConnectionId(), getIdAsString(),
+
log.trace(sm.getString("abstractStream.setConnectionAllocationRequested",
getConnectionId(), getIdAsString(),
Integer.toString(this.connectionAllocationRequested),
Integer.toString(connectionAllocationRequested)));
this.connectionAllocationRequested = connectionAllocationRequested;
}
@@ -155,7 +155,7 @@ abstract class AbstractStream {
final void setConnectionAllocationMade(int connectionAllocationMade) {
- log.debug(sm.getString("abstractStream.setConnectionAllocationMade",
getConnectionId(), getIdAsString(),
+ log.trace(sm.getString("abstractStream.setConnectionAllocationMade",
getConnectionId(), getIdAsString(),
Integer.toString(this.connectionAllocationMade),
Integer.toString(connectionAllocationMade)));
this.connectionAllocationMade = connectionAllocationMade;
}
diff --git a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
index eea078417c..64d5cf4e68 100644
--- a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
+++ b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
@@ -66,8 +66,8 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
final void set(Setting setting, long value) throws T {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("connectionSettings.debug", connectionId,
getEndpointName(), setting,
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("connectionSettings.debug", connectionId,
getEndpointName(), setting,
Long.toString(value)));
}
diff --git a/java/org/apache/coyote/http2/HpackDecoder.java
b/java/org/apache/coyote/http2/HpackDecoder.java
index 4372b3fa39..1d04406892 100644
--- a/java/org/apache/coyote/http2/HpackDecoder.java
+++ b/java/org/apache/coyote/http2/HpackDecoder.java
@@ -263,8 +263,8 @@ public class HpackDecoder {
addStaticTableEntry(index);
} else {
int adjustedIndex = getRealIndex(index -
Hpack.STATIC_TABLE_LENGTH);
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("hpackdecoder.useDynamic",
Integer.valueOf(adjustedIndex)));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("hpackdecoder.useDynamic",
Integer.valueOf(adjustedIndex)));
}
Hpack.HeaderField headerField = headerTable[adjustedIndex];
emitHeader(headerField.name, headerField.value);
@@ -295,8 +295,8 @@ public class HpackDecoder {
private void addStaticTableEntry(int index) throws HpackException {
// adds an entry from the static table.
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("hpackdecoder.useStatic",
Integer.valueOf(index)));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("hpackdecoder.useStatic",
Integer.valueOf(index)));
}
Hpack.HeaderField entry = Hpack.STATIC_TABLE[index];
emitHeader(entry.name, (entry.value == null) ? "" : entry.value);
@@ -304,8 +304,8 @@ public class HpackDecoder {
private void addEntryToHeaderTable(Hpack.HeaderField entry) {
if (entry.size > maxMemorySizeSoft) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("hpackdecoder.clearDynamic"));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("hpackdecoder.clearDynamic"));
}
// it is to big to fit, so we just completely clear the table.
while (filledTableSlots > 0) {
@@ -323,8 +323,8 @@ public class HpackDecoder {
int newTableSlots = filledTableSlots + 1;
int tableLength = headerTable.length;
int index = (firstSlotPosition + filledTableSlots) % tableLength;
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("hpackdecoder.addDynamic",
Integer.valueOf(index), entry.name, entry.value));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("hpackdecoder.addDynamic",
Integer.valueOf(index), entry.name, entry.value));
}
headerTable[index] = entry;
int newSize = currentMemorySize + entry.size;
@@ -433,8 +433,8 @@ public class HpackDecoder {
int inc = 3 + name.length() + value.length();
headerSize += inc;
if (!isHeaderCountExceeded() && !isHeaderSizeExceeded(0)) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("hpackdecoder.emitHeader", name,
value));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("hpackdecoder.emitHeader", name,
value));
}
headerEmitter.emitHeader(name, value);
}
diff --git a/java/org/apache/coyote/http2/HpackEncoder.java
b/java/org/apache/coyote/http2/HpackEncoder.java
index 79b2a8a771..391423ea8b 100644
--- a/java/org/apache/coyote/http2/HpackEncoder.java
+++ b/java/org/apache/coyote/http2/HpackEncoder.java
@@ -151,8 +151,8 @@ class HpackEncoder {
if (!skip) {
String val = headers.getValue(it).toString();
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("hpackEncoder.encodeHeader",
headerName, val));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("hpackEncoder.encodeHeader",
headerName, val));
}
TableEntry tableEntry = findInTable(headerName, val);
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 331c111428..2d873b049d 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -128,8 +128,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
@Override
void sendStreamReset(StreamStateMachine state, StreamException se) throws
IOException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.rst.debug", connectionId,
Integer.toString(se.getStreamId()),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.rst.debug", connectionId,
Integer.toString(se.getStreamId()),
se.getError(), se.getMessage()));
}
// Write a RST frame
@@ -224,8 +224,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
@Override
void writeBody(Stream stream, ByteBuffer data, int len, boolean finished)
throws IOException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.writeBody", connectionId,
stream.getIdAsString(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.writeBody", connectionId,
stream.getIdAsString(),
Integer.toString(len), Boolean.valueOf(finished)));
}
@@ -255,8 +255,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
@Override
void writeWindowUpdate(AbstractNonZeroStream stream, int increment,
boolean applicationInitiated)
throws IOException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.windowUpdateConnection",
getConnectionId(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.windowUpdateConnection",
getConnectionId(),
Integer.valueOf(increment)));
}
// Build window update frame for stream 0
@@ -269,8 +269,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
if (stream instanceof Stream && ((Stream) stream).canWrite()) {
int streamIncrement = ((Stream)
stream).getWindowUpdateSizeToWrite(increment);
if (streamIncrement > 0) {
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("upgradeHandler.windowUpdateStream", getConnectionId(),
getIdAsString(),
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("upgradeHandler.windowUpdateStream", getConnectionId(),
getIdAsString(),
Integer.valueOf(streamIncrement)));
}
byte[] frame2 = new byte[13];
@@ -339,8 +339,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
return SendfileState.ERROR;
}
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.sendfile.reservation",
connectionId,
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.sendfile.reservation",
connectionId,
sendfile.stream.getIdAsString(),
Integer.valueOf(sendfile.connectionReservation),
Integer.valueOf(sendfile.streamReservation)));
}
@@ -361,8 +361,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
sentEndOfStream(sendfile.stream);
}
if (writable) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.writeBody",
connectionId, sendfile.stream.getIdAsString(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.writeBody",
connectionId, sendfile.stream.getIdAsString(),
Integer.toString(frameSize),
Boolean.valueOf(finished)));
}
ByteUtil.set31Bits(header, 5, sendfile.stream.getIdAsInt());
@@ -420,8 +420,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
return;
}
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("upgradeHandler.sendfile.reservation", connectionId,
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("upgradeHandler.sendfile.reservation", connectionId,
sendfile.stream.getIdAsString(),
Integer.valueOf(sendfile.connectionReservation),
Integer.valueOf(sendfile.streamReservation)));
}
@@ -442,8 +442,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
sentEndOfStream(sendfile.stream);
}
if (writable) {
- if (log.isDebugEnabled()) {
- log.debug(
+ if (log.isTraceEnabled()) {
+ log.trace(
sm.getString("upgradeHandler.writeBody",
connectionId, sendfile.stream.getIdAsString(),
Integer.toString(frameSize),
Boolean.valueOf(finished)));
}
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 384a5baf00..614ebbaaf9 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -177,14 +177,14 @@ class Http2Parser {
dataLength = payloadSize;
}
- if (log.isDebugEnabled()) {
+ if (log.isTraceEnabled()) {
String padding;
if (Flags.hasPadding(flags)) {
padding = Integer.toString(padLength);
} else {
padding = "none";
}
- log.debug(sm.getString("http2Parser.processFrameData.lengths",
connectionId, Integer.toString(streamId),
+ log.trace(sm.getString("http2Parser.processFrameData.lengths",
connectionId, Integer.toString(streamId),
Integer.toString(dataLength), padding));
}
@@ -410,8 +410,8 @@ class Http2Parser {
}
int windowSizeIncrement = ByteUtil.get31Bits(payload, 0);
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("http2Parser.processFrameWindowUpdate.debug",
connectionId,
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("http2Parser.processFrameWindowUpdate.debug",
connectionId,
Integer.toString(streamId),
Integer.toString(windowSizeIncrement)));
}
@@ -473,8 +473,8 @@ class Http2Parser {
Reader r = new BufferedReader(new InputStreamReader(bais,
StandardCharsets.US_ASCII));
Priority p = Priority.parsePriority(r);
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("http2Parser.processFramePriorityUpdate.debug",
connectionId,
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("http2Parser.processFramePriorityUpdate.debug",
connectionId,
Integer.toString(prioritizedStreamID),
Integer.toString(p.getUrgency()),
Boolean.valueOf(p.getIncremental())));
}
@@ -486,8 +486,8 @@ class Http2Parser {
protected void readHeaderPayload(int streamId, int payloadSize, ByteBuffer
buffer)
throws Http2Exception, IOException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("http2Parser.processFrameHeaders.payload",
connectionId, Integer.valueOf(streamId),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("http2Parser.processFrameHeaders.payload",
connectionId, Integer.valueOf(streamId),
Integer.valueOf(payloadSize)));
}
@@ -581,8 +581,8 @@ class Http2Parser {
*/
protected void swallowPayload(int streamId, int frameTypeId, int len,
boolean isPadding, ByteBuffer byteBuffer)
throws IOException, ConnectionException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("http2Parser.swallow.debug", connectionId,
Integer.toString(streamId),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("http2Parser.swallow.debug", connectionId,
Integer.toString(streamId),
Integer.toString(len)));
}
try {
@@ -665,8 +665,8 @@ class Http2Parser {
protected void validateFrame(FrameType expected, FrameType frameType, int
streamId, int flags, int payloadSize)
throws Http2Exception {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("http2Parser.processFrame", connectionId,
Integer.toString(streamId), frameType,
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("http2Parser.processFrame", connectionId,
Integer.toString(streamId), frameType,
Integer.toString(flags), Integer.toString(payloadSize)));
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index f6963e53cd..e12fe09a15 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -172,8 +172,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
// Initial HTTP request becomes stream 1.
if (coyoteRequest != null) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.upgrade",
connectionId));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.upgrade",
connectionId));
}
Integer key = Integer.valueOf(1);
Stream stream = new Stream(key, this, coyoteRequest);
@@ -192,8 +192,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
@Override
public void init(WebConnection webConnection) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.init", connectionId,
connectionState.get()));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.init", connectionId,
connectionState.get()));
}
if (!connectionState.compareAndSet(ConnectionState.NEW,
ConnectionState.CONNECTED)) {
@@ -255,8 +255,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
}
throw new ProtocolException(msg);
}
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.prefaceReceived",
connectionId));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.prefaceReceived",
connectionId));
}
// Allow streams and connection to determine timeouts
@@ -325,8 +325,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
@Override
public SocketState upgradeDispatch(SocketEvent status) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.upgradeDispatch.entry",
connectionId, status));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.upgradeDispatch.entry",
connectionId, status));
}
// WebConnection is not used so passing null here is fine
@@ -445,8 +445,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
close();
}
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.upgradeDispatch.exit",
connectionId, result));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.upgradeDispatch.exit",
connectionId, result));
}
return result;
}
@@ -506,8 +506,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
@Override
public void pause() {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.pause.entry",
connectionId));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.pause.entry",
connectionId));
}
if (connectionState.compareAndSet(ConnectionState.CONNECTED,
ConnectionState.PAUSING)) {
@@ -569,8 +569,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
void sendStreamReset(StreamStateMachine state, StreamException se) throws
IOException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.rst.debug", connectionId,
Integer.toString(se.getStreamId()),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.rst.debug", connectionId,
Integer.toString(se.getStreamId()),
se.getError(), se.getMessage()));
}
@@ -727,12 +727,12 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
protected HeaderFrameBuffers doWriteHeaders(Stream stream, int
pushedStreamId, MimeHeaders mimeHeaders,
boolean endOfStream, int payloadSize) throws IOException {
- if (log.isDebugEnabled()) {
+ if (log.isTraceEnabled()) {
if (pushedStreamId == 0) {
- log.debug(sm.getString("upgradeHandler.writeHeaders",
connectionId, stream.getIdAsString(),
+ log.trace(sm.getString("upgradeHandler.writeHeaders",
connectionId, stream.getIdAsString(),
Boolean.valueOf(endOfStream)));
} else {
- log.debug(sm.getString("upgradeHandler.writePushHeaders",
connectionId, stream.getIdAsString(),
+ log.trace(sm.getString("upgradeHandler.writePushHeaders",
connectionId, stream.getIdAsString(),
Integer.valueOf(pushedStreamId),
Boolean.valueOf(endOfStream)));
}
}
@@ -777,8 +777,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
if (state == State.COMPLETE) {
headerFrameBuffers.getHeader()[4] += FLAG_END_OF_HEADERS;
}
- if (log.isDebugEnabled()) {
- log.debug(headerFrameBuffers.getPayload().limit() + "
bytes");
+ if (log.isTraceEnabled()) {
+ log.trace(headerFrameBuffers.getPayload().limit() + "
bytes");
}
ByteUtil.set31Bits(headerFrameBuffers.getHeader(), 5,
stream.getIdAsInt());
headerFrameBuffers.endFrame();
@@ -806,8 +806,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
void writeBody(Stream stream, ByteBuffer data, int len, boolean finished)
throws IOException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.writeBody", connectionId,
stream.getIdAsString(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.writeBody", connectionId,
stream.getIdAsString(),
Integer.toString(len), Boolean.valueOf(finished)));
}
@@ -867,8 +867,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
*/
void writeWindowUpdate(AbstractNonZeroStream stream, int increment,
boolean applicationInitiated)
throws IOException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.windowUpdateConnection",
getConnectionId(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.windowUpdateConnection",
getConnectionId(),
Integer.valueOf(increment)));
}
socketWrapper.getLock().lock();
@@ -884,8 +884,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
if (stream instanceof Stream && ((Stream) stream).canWrite()) {
int streamIncrement = ((Stream)
stream).getWindowUpdateSizeToWrite(increment);
if (streamIncrement > 0) {
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("upgradeHandler.windowUpdateStream", getConnectionId(),
getIdAsString(),
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("upgradeHandler.windowUpdateStream", getConnectionId(),
getIdAsString(),
Integer.valueOf(streamIncrement)));
}
// Re-use buffer as connection update has already been
written
@@ -1037,8 +1037,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
if (streamsToNotify != null) {
for (AbstractStream stream : streamsToNotify) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.releaseBacklog",
connectionId, stream.getIdAsString()));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.releaseBacklog",
connectionId, stream.getIdAsString()));
}
// There is never any O/P on stream zero but it is included in
// the backlog as it simplifies the code. Skip it if it appears
@@ -1175,8 +1175,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
private int allocate(AbstractStream stream, int allocation) {
windowAllocationLock.lock();
try {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.allocate.debug",
getConnectionId(), stream.getIdAsString(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.allocate.debug",
getConnectionId(), stream.getIdAsString(),
Integer.toString(allocation)));
}
@@ -1194,8 +1194,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
leftToAllocate = leftToAllocate - allocatedThisTime;
}
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.allocate.left",
getConnectionId(), stream.getIdAsString(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.allocate.left",
getConnectionId(), stream.getIdAsString(),
Integer.toString(leftToAllocate)));
}
@@ -1318,8 +1318,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
final int size = streams.size();
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
Long.toString(max),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.pruneStart", connectionId,
Long.toString(max),
Integer.toString(size)));
}
@@ -1337,8 +1337,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
streams.remove(stream.getIdentifier());
toClose--;
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.pruned", connectionId,
stream.getIdAsString()));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.pruned", connectionId,
stream.getIdAsString()));
}
}
@@ -1426,8 +1426,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
private void updateOverheadCount(FrameType frameType, int increment) {
long newOverheadCount = overheadCount.addAndGet(increment);
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.overheadChange",
connectionId, getIdAsString(), frameType.name(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.overheadChange",
connectionId, getIdAsString(), frameType.name(),
Long.valueOf(newOverheadCount)));
}
}
@@ -1530,8 +1530,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
abstractNonZeroStream.receivedData(payloadSize);
ByteBuffer result = abstractNonZeroStream.getInputByteBuffer();
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("upgradeHandler.startRequestBodyFrame.result",
getConnectionId(),
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("upgradeHandler.startRequestBodyFrame.result",
getConnectionId(),
abstractNonZeroStream.getIdAsString(), result));
}
@@ -1585,8 +1585,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
closeIdleStreams(streamId);
return stream;
} else {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.noNewStreams",
connectionId, Integer.toString(streamId)));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.noNewStreams",
connectionId, Integer.toString(streamId)));
}
reduceOverheadCount(FrameType.HEADERS);
// Stateless so a static can be used to save on GC
@@ -1713,8 +1713,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
public void reset(int streamId, long errorCode) throws Http2Exception {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.reset.receive",
getConnectionId(), Integer.toString(streamId),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.reset.receive",
getConnectionId(), Integer.toString(streamId),
Long.toString(errorCode)));
}
increaseOverheadCount(FrameType.RST,
getProtocol().getOverheadResetFactor());
@@ -1798,8 +1798,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
public void goaway(int lastStreamId, long errorCode, String debugData) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.goaway.debug",
connectionId, Integer.toString(lastStreamId),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("upgradeHandler.goaway.debug",
connectionId, Integer.toString(lastStreamId),
Long.toHexString(errorCode), debugData));
}
close();
@@ -1945,8 +1945,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
// the queue to 3 entries to use for the rolling
average.
roundTripTimes.poll();
}
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("pingManager.roundTripTime",
connectionId, Long.valueOf(roundTripTime)));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("pingManager.roundTripTime",
connectionId, Long.valueOf(roundTripTime)));
}
}
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index eac438d25f..b1c42489a7 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -200,8 +200,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
final void receiveReset(long errorCode) {
- if (log.isDebugEnabled()) {
- log.debug(
+ if (log.isTraceEnabled()) {
+ log.trace(
sm.getString("stream.reset.receive", getConnectionId(),
getIdAsString(), Long.toString(errorCode)));
}
// Set the new state first since read and write both check this
@@ -310,8 +310,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
@Override
public final void emitHeader(String name, String value) throws
HpackException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.header.debug", getConnectionId(),
getIdAsString(), name, value));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("stream.header.debug", getConnectionId(),
getIdAsString(), name, value));
}
// Header names must be lower case
@@ -742,8 +742,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
if (http2Exception instanceof StreamException) {
try {
StreamException se = (StreamException) http2Exception;
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.reset.send",
getConnectionId(), getIdAsString(), se.getError()));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("stream.reset.send",
getConnectionId(), getIdAsString(), se.getError()));
}
// Need to update state atomically with the sending of the RST
@@ -779,8 +779,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
* period after the Stream closes.
*/
final void recycle() {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.recycle", getConnectionId(),
getIdAsString()));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("stream.recycle", getConnectionId(),
getIdAsString()));
}
int remaining;
// May be null if stream was closed before any DATA frames were
processed.
@@ -1021,8 +1021,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private boolean flush(boolean writeInProgress, boolean block) throws
IOException {
writeLock.lock();
try {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.outputBuffer.flush.debug",
getConnectionId(), getIdAsString(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("stream.outputBuffer.flush.debug",
getConnectionId(), getIdAsString(),
Integer.toString(buffer.position()),
Boolean.toString(writeInProgress),
Boolean.toString(closed)));
}
@@ -1216,8 +1216,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
while (inBuffer.position() == 0 && (canRead = isActive() &&
!isInputFinished())) {
// Need to block until some data is written
try {
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("stream.inputBuffer.empty"));
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("stream.inputBuffer.empty"));
}
long readTimeout =
handler.getProtocol().getStreamReadTimeout();
@@ -1252,8 +1252,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
// outBuffer.
inBuffer.flip();
written = inBuffer.remaining();
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.inputBuffer.copy",
Integer.toString(written)));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("stream.inputBuffer.copy",
Integer.toString(written)));
}
inBuffer.get(outBuffer, 0, written);
inBuffer.clear();
@@ -1330,8 +1330,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
if (closed) {
swallowUnread();
} else if (readInterest) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.inputBuffer.dispatch"));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("stream.inputBuffer.dispatch"));
}
readInterest = false;
coyoteRequest.action(ActionCode.DISPATCH_READ, null);
@@ -1340,8 +1340,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
// own.
coyoteRequest.action(ActionCode.DISPATCH_EXECUTE, null);
} else {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.inputBuffer.signal"));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("stream.inputBuffer.signal"));
}
synchronized (inBuffer) {
inBuffer.notifyAll();
@@ -1421,8 +1421,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
int unreadByteCount = 0;
synchronized (inBuffer) {
unreadByteCount = inBuffer.position();
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("stream.inputBuffer.swallowUnread",
Integer.valueOf(unreadByteCount)));
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("stream.inputBuffer.swallowUnread",
Integer.valueOf(unreadByteCount)));
}
if (unreadByteCount > 0) {
inBuffer.position(0);
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index 4b7990faea..43865c1ea4 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -527,8 +527,8 @@ class StreamProcessor extends AbstractProcessor {
@Override
protected final boolean flushBufferedWrite() throws IOException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("streamProcessor.flushBufferedWrite.entry",
stream.getConnectionId(),
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("streamProcessor.flushBufferedWrite.entry",
stream.getConnectionId(),
stream.getIdAsString()));
}
if (stream.flush(false)) {
diff --git a/java/org/apache/coyote/http2/StreamStateMachine.java
b/java/org/apache/coyote/http2/StreamStateMachine.java
index bafb24193a..b94c89cf73 100644
--- a/java/org/apache/coyote/http2/StreamStateMachine.java
+++ b/java/org/apache/coyote/http2/StreamStateMachine.java
@@ -106,8 +106,8 @@ class StreamStateMachine {
private void stateChange(State oldState, State newState) {
if (state == oldState) {
state = newState;
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("streamStateMachine.debug.change",
connectionId, streamId, oldState, newState));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("streamStateMachine.debug.change",
connectionId, streamId, oldState, newState));
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61628df9f6..eb68e8e488 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,11 @@
protects against various race conditions that woudl otherwise occur if
application threads continued to access the <code>AsyncContext</code>.
</fix>
+ <fix>
+ Review usage of debug logging and downgrade trace or data dumping
+ operations from debug level to trace. In particular, most of the
+ HTTP/2 debug logging has been changed to trace level. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
