Merge #3239 into 1.1.19

reactor · May 13, 2024 · ce87569 · ce87569
2 parents 99e319e + ce2b98a
commit ce87569
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpTrafficHandler.java b/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpTrafficHandler.java
@@ -171,7 +171,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
  if (persistentConnection) {
  pendingResponses += 1;
  if (HttpServerOperations.log.isDebugEnabled()) {
- HttpServerOperations.log.debug(format(ctx.channel(), "Increasing pending responses, now {}"),
+ HttpServerOperations.log.debug(format(ctx.channel(), "Increasing pending responses count: {}"),
  pendingResponses);
  }
  persistentConnection = isKeepAlive(request);
@@ -187,7 +187,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
  if (pendingResponses > 1) {
  if (HttpServerOperations.log.isDebugEnabled()) {
  HttpServerOperations.log.debug(format(ctx.channel(), "Buffering pipelined HTTP request, " +
- "pending response count: {}, queue: {}"),
+ "pending responses count: {}, queue: {}"),
  pendingResponses,
  pipelined != null ? pipelined.size() : 0);
  }
@@ -267,7 +267,7 @@ else if (persistentConnection && pendingResponses == 0) {
  else if (overflow) {
  if (HttpServerOperations.log.isDebugEnabled()) {
  HttpServerOperations.log.debug(format(ctx.channel(), "Buffering pipelined HTTP content, " +
- "pending response count: {}, pending pipeline:{}"),
+ "pending responses count: {}, queue: {}"),
  pendingResponses,
  pipelined != null ? pipelined.size() : 0);
  }
@@ -335,7 +335,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
  if (!shouldKeepAlive()) {
  if (HttpServerOperations.log.isDebugEnabled()) {
  HttpServerOperations.log.debug(format(ctx.channel(), "Detected non persistent http " +
- "connection, preparing to close"),
+ "connection, preparing to close. Pending responses count: {}"),
  pendingResponses);
  }
  ctx.write(msg, promise.unvoid())
@@ -355,15 +355,15 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
  nonInformationalResponse = false;
  pendingResponses -= 1;
  if (HttpServerOperations.log.isDebugEnabled()) {
- HttpServerOperations.log.debug(format(ctx.channel(), "Decreasing pending responses, now {}"),
+ HttpServerOperations.log.debug(format(ctx.channel(), "Decreasing pending responses count: {}"),
  pendingResponses);
  }
  }
 
  if (pipelined != null && !pipelined.isEmpty()) {
  if (HttpServerOperations.log.isDebugEnabled()) {
  HttpServerOperations.log.debug(format(ctx.channel(), "Draining next pipelined " +
- "request, pending response count: {}, queued: {}"),
+ "HTTP request, pending responses count: {}, queued: {}"),
  pendingResponses, pipelined.size());
  }
  ctx.executor()