diff --git a/jetty-core/jetty-alpn/jetty-alpn-bouncycastle-server/src/main/java/org/eclipse/jetty/alpn/bouncycastle/server/BouncyCastleServerALPNProcessor.java b/jetty-core/jetty-alpn/jetty-alpn-bouncycastle-server/src/main/java/org/eclipse/jetty/alpn/bouncycastle/server/BouncyCastleServerALPNProcessor.java index 7cb6894deeb7..9ab99d87552c 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-bouncycastle-server/src/main/java/org/eclipse/jetty/alpn/bouncycastle/server/BouncyCastleServerALPNProcessor.java +++ b/jetty-core/jetty-alpn/jetty-alpn-bouncycastle-server/src/main/java/org/eclipse/jetty/alpn/bouncycastle/server/BouncyCastleServerALPNProcessor.java @@ -84,7 +84,7 @@ public void handshakeSucceeded(Event event) public void handshakeFailed(Event event, Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("TLS handshake failed {}", alpnConnection, failure); + LOG.atDebug().setCause(failure).log("TLS handshake failed {}", alpnConnection); } } } diff --git a/jetty-core/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java b/jetty-core/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java index 8ed9bcdef19f..8ed42043539d 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java +++ b/jetty-core/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java @@ -58,7 +58,7 @@ public ALPNClientConnectionFactory(Executor executor, ClientConnectionFactory co catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to load client processor", x); + LOG.atDebug().setCause(x).log("Unable to load client processor"); failure.addSuppressed(x); return; } @@ -71,7 +71,7 @@ public ALPNClientConnectionFactory(Executor executor, ClientConnectionFactory co catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not initialize {}", processor, x); + LOG.atDebug().setCause(x).log("Could not initialize {}", processor); failure.addSuppressed(x); } }); diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptServerALPNProcessor.java b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptServerALPNProcessor.java index 46f6453315a4..1d34feb782d9 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptServerALPNProcessor.java +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptServerALPNProcessor.java @@ -108,7 +108,7 @@ public void handshakeSucceeded(Event event) public void handshakeFailed(Event event, Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("TLS handshake failed {}", alpnConnection, failure); + LOG.atDebug().setCause(failure).log("TLS handshake failed {}", alpnConnection); } } } diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-server/src/main/java/org/eclipse/jetty/alpn/java/server/JDK9ServerALPNProcessor.java b/jetty-core/jetty-alpn/jetty-alpn-java-server/src/main/java/org/eclipse/jetty/alpn/java/server/JDK9ServerALPNProcessor.java index d8cbb77f9d8b..074859f081c2 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-server/src/main/java/org/eclipse/jetty/alpn/java/server/JDK9ServerALPNProcessor.java +++ b/jetty-core/jetty-alpn/jetty-alpn-java-server/src/main/java/org/eclipse/jetty/alpn/java/server/JDK9ServerALPNProcessor.java @@ -93,7 +93,7 @@ public void handshakeSucceeded(Event event) public void handshakeFailed(Event event, Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("TLS handshake failed {}", alpnConnection, failure); + LOG.atDebug().setCause(failure).log("TLS handshake failed {}", alpnConnection); } } } diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java b/jetty-core/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java index 6e1477ec427d..f720beacab31 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java +++ b/jetty-core/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java @@ -56,7 +56,7 @@ public ALPNServerConnectionFactory(@Name("protocols") String... protocols) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x.getMessage(), x); + LOG.atDebug().setCause(x).log(x.getMessage()); if (x != failure) failure.addSuppressed(x); return; @@ -70,7 +70,7 @@ public ALPNServerConnectionFactory(@Name("protocols") String... protocols) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not initialize {}", processor, x); + LOG.atDebug().setCause(x).log("Could not initialize {}", processor); if (x != failure) failure.addSuppressed(x); } diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java index 2d65f3c16a25..b2704e0f5481 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java @@ -586,7 +586,7 @@ public void succeeded(Connection connection) public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Connection creation failed {}", reserved, x); + LOG.atDebug().setCause(x).log("Connection creation failed {}", reserved); pending.decrementAndGet(); reserved.remove(); super.failed(x); diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java index 633bff2e78f1..761316f32f1a 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java @@ -238,7 +238,7 @@ public void onComplete(Result result) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Authentication failed", x); + LOG.atDebug().setCause(x).log("Authentication failed"); forwardFailureComplete(request, null, response, x); } } diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/InputStreamResponseListener.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/InputStreamResponseListener.java index 1a2d6390394a..9ad8cefa5718 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/InputStreamResponseListener.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/InputStreamResponseListener.java @@ -157,7 +157,7 @@ public void onFailure(Response response, Throwable failure) } if (LOG.isDebugEnabled()) - LOG.debug("Content failure", failure); + LOG.atDebug().setCause(failure).log("Content failure"); chunkCallbacks.forEach(chunkCallback -> chunkCallback.releaseAndFail(failure)); } @@ -186,7 +186,7 @@ public void onComplete(Result result) if (failure == null) LOG.debug("Result success"); else - LOG.debug("Result failure", failure); + LOG.atDebug().setCause(failure).log("Result failure"); } chunkCallbacks.forEach(t -> t.releaseAndFail(failure)); diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java index eba3490665b9..217f2bce0d50 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java @@ -162,7 +162,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("SOCKS4 failure", x); + LOG.atDebug().setCause(x).log("SOCKS4 failure"); getEndPoint().close(x); @SuppressWarnings("unchecked") Promise promise = (Promise)context.get(Connection.PROMISE_CONTEXT_KEY); diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks5Proxy.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks5Proxy.java index d817f2d3dbf9..f29388fdad28 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks5Proxy.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks5Proxy.java @@ -190,7 +190,7 @@ private void handshakeSent() private void fail(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("SOCKS5 failure", x); + LOG.atDebug().setCause(x).log("SOCKS5 failure"); getEndPoint().close(x); @SuppressWarnings("unchecked") Promise promise = (Promise)this.context.get(Connection.PROMISE_CONTEXT_KEY); diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpDestination.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpDestination.java index 11c403bb4035..50a664c912e5 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpDestination.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpDestination.java @@ -398,7 +398,7 @@ private boolean process(Connection connection) if (cause != null) { if (LOG.isDebugEnabled()) - LOG.debug("Aborted before processing {}", exchange, cause); + LOG.atDebug().setCause(cause).log("Aborted before processing {}", exchange); // It may happen that the request is aborted before the exchange // is created. Aborting the exchange a second time will result in // a no-operation, so we just abort here to cover that edge case. diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpExchange.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpExchange.java index 10d455bb4bbc..97994a5621fe 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpExchange.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpExchange.java @@ -264,7 +264,7 @@ public void abort(Throwable failure, Promise promise) } if (LOG.isDebugEnabled()) - LOG.debug("Failed {}: req={}/rsp={}", this, abortRequest, abortResponse, failure); + LOG.atDebug().setCause(failure).log("Failed {}: req={}/rsp={}", this, abortRequest, abortResponse); // We failed this exchange, deal with it. @@ -283,7 +283,7 @@ public void abort(Throwable failure, Promise promise) if (destination.remove(this)) { if (LOG.isDebugEnabled()) - LOG.debug("Aborting while queued {}", this, failure); + LOG.atDebug().setCause(failure).log("Aborting while queued {}", this); notifyFailureComplete(failure); promise.succeeded(true); return; @@ -293,7 +293,7 @@ public void abort(Throwable failure, Promise promise) { // Case #2: exchange was not yet associated. if (LOG.isDebugEnabled()) - LOG.debug("Aborting before association {}", this, failure); + LOG.atDebug().setCause(failure).log("Aborting before association {}", this); notifyFailureComplete(failure); promise.succeeded(true); return; @@ -301,7 +301,7 @@ public void abort(Throwable failure, Promise promise) // Case #3: exchange was already associated. if (LOG.isDebugEnabled()) - LOG.debug("Aborting while active {}", this, failure); + LOG.atDebug().setCause(failure).log("Aborting while active {}", this); channel.abort(this, abortRequest ? failure : null, abortResponse ? failure : null, promise); } diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpReceiver.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpReceiver.java index 0bc99d8e9064..40d50e2a395d 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpReceiver.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpReceiver.java @@ -500,7 +500,7 @@ private void cleanup() public void abort(HttpExchange exchange, Throwable failure, Promise promise) { if (LOG.isDebugEnabled()) - LOG.debug("Invoking abort for {} on {}", exchange, this, failure); + LOG.atDebug().setCause(failure).log("Invoking abort for {} on {}", exchange, this); if (!exchange.isResponseCompleteOrTerminated()) throw new IllegalStateException(); diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java index 6124e1dcbe9b..7072c774d841 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java @@ -209,7 +209,7 @@ private boolean failRequest(Throwable failure) return false; if (LOG.isDebugEnabled()) - LOG.debug("Request failure {}, response {}", exchange.getRequest(), exchange.getResponse(), failure); + LOG.atDebug().setCause(failure).log("Request failure {}, response {}", exchange.getRequest(), exchange.getResponse()); // Mark atomically the request as completed, with respect // to concurrency between request success and request failure. @@ -226,7 +226,7 @@ private void executeAbort(HttpExchange exchange, Throwable failure) catch (RejectedExecutionException x) { if (LOG.isDebugEnabled()) - LOG.debug("Exchange aborted {}", exchange, x); + LOG.atDebug().setCause(x).log("Exchange aborted {}", exchange); abort(exchange, failure, Promise.noop()); } } @@ -243,7 +243,7 @@ private void abortRequest(HttpExchange exchange) dispose(); if (LOG.isDebugEnabled()) - LOG.debug("Request abort {} {} on {}", request, exchange, getHttpChannel(), failure); + LOG.atDebug().setCause(failure).log("Request abort {} {} on {}", request, exchange, getHttpChannel()); request.notifyFailure(failure); // Mark atomically the request as terminated, with diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpReceiverOverHTTP.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpReceiverOverHTTP.java index 59d8e7532921..1ce29f9cac78 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpReceiverOverHTTP.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpReceiverOverHTTP.java @@ -297,7 +297,7 @@ else if (read == 0) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Error processing {} in {}", endPoint, this, x); + LOG.atDebug().setCause(x).log("Error processing {} in {}", endPoint, this); releaseNetworkBuffer(); failAndClose(x); return false; diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpSenderOverHTTP.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpSenderOverHTTP.java index b21d155bfcd7..b33f1a62d4b3 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpSenderOverHTTP.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpSenderOverHTTP.java @@ -79,7 +79,7 @@ protected void sendHeaders(HttpExchange exchange, ByteBuffer contentBuffer, bool catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to send headers on exchange {}", exchange, x); + LOG.atDebug().setCause(x).log("Unable to send headers on exchange {}", exchange); callback.failed(x); } } @@ -99,7 +99,7 @@ protected void sendContent(HttpExchange exchange, ByteBuffer contentBuffer, bool catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to send content on {}", exchange, x); + LOG.atDebug().setCause(x).log("Unable to send content on {}", exchange); callback.failed(x); } } diff --git a/jetty-core/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/StandardDeployer.java b/jetty-core/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/StandardDeployer.java index 6ee154cb9b00..fef0bc3c3759 100644 --- a/jetty-core/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/StandardDeployer.java +++ b/jetty-core/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/StandardDeployer.java @@ -121,7 +121,7 @@ public void deploy(ContextHandler contextHandler) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("{} Deploy failed {}", this, contextHandler, t); + LOG.atDebug().setCause(t).log("{} Deploy failed {}", this, contextHandler); ExceptionUtil.ifExceptionThrowUnchecked(t); } @@ -153,7 +153,7 @@ public void redeploy(ContextHandler oldHandler, ContextHandler newContextHandler catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("{} Redeploy failed {}", this, newContextHandler, t); + LOG.atDebug().setCause(t).log("{} Redeploy failed {}", this, newContextHandler); ExceptionUtil.ifExceptionThrowUnchecked(t); } diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/transport/internal/HttpConnectionOverFCGI.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/transport/internal/HttpConnectionOverFCGI.java index c40f8d6032c0..4a874ad4e1ec 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/transport/internal/HttpConnectionOverFCGI.java +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/transport/internal/HttpConnectionOverFCGI.java @@ -239,7 +239,7 @@ else if (read < 0) catch (Exception x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to fill from endpoint {}", endPoint, x); + LOG.atDebug().setCause(x).log("Unable to fill from endpoint {}", endPoint); close(x); return false; } @@ -528,7 +528,7 @@ public boolean onEnd(int request) public void onFailure(int request, Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("onFailure request={}", request, failure); + LOG.atDebug().setCause(failure).log("onFailure request={}", request); failAndClose(failure); } } diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java index 4e6cbd119608..7709139b00ff 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java @@ -241,7 +241,7 @@ protected void onParam(String name, String value) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); } } @@ -254,7 +254,7 @@ protected boolean onParams() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); return false; } } diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java index 85eec1b85bad..7826d296773e 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java @@ -187,7 +187,7 @@ public void parsedHeader(HttpField httpField) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); } } @@ -200,7 +200,7 @@ private void notifyBegin(int code, String reason) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); } } @@ -213,7 +213,7 @@ private void notifyHeader(HttpField httpField) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); } } @@ -237,7 +237,7 @@ private boolean notifyHeaders() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); return false; } } @@ -273,7 +273,7 @@ private boolean notifyContent(ByteBuffer buffer) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); return false; } } @@ -313,7 +313,7 @@ protected void fail(Throwable failure) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); } } } diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java index f022b376114e..8708f1b85d48 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java @@ -92,7 +92,7 @@ public boolean noContent() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); return false; } } @@ -108,7 +108,7 @@ protected boolean onContent(ByteBuffer buffer) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Exception while invoking listener {}", listener); return false; } } diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java index b979e4438e39..f31e1e113eeb 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java +++ b/jetty-core/jetty-fcgi/jetty-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java @@ -206,7 +206,7 @@ else if (read == 0) catch (Exception x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to fill endpoint", x); + LOG.atDebug().setCause(x).log("Unable to fill endpoint"); inputBuffer.clear(); releaseInputBuffer(); // TODO: fail and close ? @@ -279,7 +279,7 @@ private int fillInputBuffer() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not fill from {}", this, x); + LOG.atDebug().setCause(x).log("Could not fill from {}", this); return -1; } } @@ -399,7 +399,7 @@ public boolean onEnd(int request) public void onFailure(int request, Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("Request {} failure on {}", request, stream, failure); + LOG.atDebug().setCause(failure).log("Request {} failure on {}", request, stream); if (stream != null) ThreadPool.executeImmediately(getExecutor(), stream.getHttpChannel().onFailure(new BadMessageException(null, failure))); stream = null; diff --git a/jetty-core/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java b/jetty-core/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java index c379b54ff0fb..16ade871c7d1 100644 --- a/jetty-core/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java +++ b/jetty-core/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java @@ -67,7 +67,7 @@ public boolean handle(Request request, Response response, Callback callback) } catch (Throwable t) { - LOG.debug("Failed to handle", t); + LOG.atDebug().setCause(t).log("Failed to handle"); Response.writeError(request, response, callback, 500, null, t); } return true; diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/ByteRange.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/ByteRange.java index 699bfeb0c3d2..c062d346f2f2 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/ByteRange.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/ByteRange.java @@ -155,7 +155,7 @@ public static List parse(List headers, long length) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not parse range {}", header, x); + LOG.atDebug().setCause(x).log("could not parse range {}", header); } } } diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpDateTime.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpDateTime.java index efc65f29fd64..a5a61427d5d7 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpDateTime.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpDateTime.java @@ -185,7 +185,7 @@ else if (token.length() == 4) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Ignore: Unable to parse Date/Time", x); + LOG.atDebug().setCause(x).log("Ignore: Unable to parse Date/Time"); } // RFC 6265 - Section 5.1.1 - Step 3 diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java index 6b40e3d2f4aa..28f168cac8c8 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java @@ -1833,7 +1833,7 @@ else if (isTerminated()) protected void badMessage(HttpException x) { if (debugEnabled) - LOG.debug("Parse exception: {} for {}", this, _handler, x); + LOG.atDebug().setCause((Throwable)x).log("Parse exception: {} for {}", this, _handler); setState(State.CLOSE); if (_headerComplete) _handler.earlyEOF(); diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java index b3d292279dfc..46597c433b53 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java @@ -477,7 +477,7 @@ public void fail(Throwable t) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Error closing part {}", this, x); + LOG.atDebug().setCause(x).log("Error closing part {}", this); } } } @@ -1315,7 +1315,7 @@ else if (type != HttpTokens.Type.SPACE && type != HttpTokens.Type.HTAB) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("parse failure {} {}", state, BufferUtil.toDetailString(buffer), x); + LOG.atDebug().setCause(x).log("parse failure {} {}", state, BufferUtil.toDetailString(buffer)); buffer.position(buffer.limit()); notifyEndOfLineViolations(); notifyFailure(x); @@ -1715,7 +1715,7 @@ private void notifyPartBegin() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -1728,7 +1728,7 @@ private void notifyPartHeader(String name, String value) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -1741,7 +1741,7 @@ private void notifyPartHeaders() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -1754,7 +1754,7 @@ private void notifyPartContent(Content.Chunk chunk) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -1767,7 +1767,7 @@ private void notifyPartEnd() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -1780,7 +1780,7 @@ private void notifyComplete() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -1793,7 +1793,7 @@ private void notifyFailure(Throwable failure) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -1826,7 +1826,7 @@ private void notifyViolation(MultiPartCompliance.Violation violation) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -2026,7 +2026,7 @@ private void notifyPart(String name, String fileName, HttpFields headers) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying part {}", name, x); + LOG.atDebug().setCause(x).log("failure while notifying part {}", name); } } } diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java index 01eec18a8bec..97f9a5f95018 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java @@ -922,7 +922,7 @@ public void onViolation(MultiPartCompliance.Violation violation) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", complianceListener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", complianceListener); } } diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/RFC6265SetCookieParser.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/RFC6265SetCookieParser.java index c3418607b3bc..41101096d728 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/RFC6265SetCookieParser.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/RFC6265SetCookieParser.java @@ -203,7 +203,7 @@ private boolean setAttribute(HttpCookie.Builder cookie, String name, String valu catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not set attribute {}={}", name, value, x); + LOG.atDebug().setCause(x).log("could not set attribute {}={}", name, value); return false; } } diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java index e9e6da865008..47061956dc01 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java @@ -263,7 +263,7 @@ public HttpContent getContent(String path) throws IOException catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Content at path '{}' is not cacheable: {}", path, httpContent, x); + LOG.atDebug().setCause(x).log("Content at path '{}' is not cacheable: {}", path, httpContent); return null; } }); diff --git a/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpChannelOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpChannelOverHTTP2.java index e2908659b455..a4e7655c2e5b 100644 --- a/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpChannelOverHTTP2.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpChannelOverHTTP2.java @@ -170,7 +170,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("ReleaseCallback failed", x); + LOG.atDebug().setCause(x).log("ReleaseCallback failed"); release(); } diff --git a/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpConnectionOverHTTP2.java b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpConnectionOverHTTP2.java index 838b534a48ce..2392d807a7aa 100644 --- a/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpConnectionOverHTTP2.java +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpConnectionOverHTTP2.java @@ -301,7 +301,7 @@ void remove() void onFailure(Throwable failure, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("Failure {}", this, failure); + LOG.atDebug().setCause(failure).log("Failure {}", this); try (AutoLock ignored = lock.lock()) { if (closed) diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java index e386db81e79c..4c9900fd85a9 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java @@ -184,7 +184,7 @@ private int fill(EndPoint endPoint, ByteBuffer buffer, boolean compact) catch (IOException x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not read from {}", endPoint, x); + LOG.atDebug().setCause(x).log("Could not read from {}", endPoint); return -1; } finally diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java index 7b1573bf1225..09899fc4855b 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java @@ -678,7 +678,7 @@ public void onStreamFailure(int streamId, int error, String reason) protected void onStreamFailure(Stream stream, int error, String reason, Throwable failure, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("Stream #{} failure {}", stream.getId(), this, failure); + LOG.atDebug().setCause(failure).log("Stream #{} failure {}", stream.getId(), this); failStream(stream, error, reason, failure, callback); } @@ -994,7 +994,7 @@ protected HTTP2Stream createLocalStream(int streamId, MetaData.Request request, { IllegalStateException failure = new IllegalStateException("Max local stream count " + maxCount + " exceeded: " + localCount); if (LOG.isDebugEnabled()) - LOG.debug("Could not create local stream #{} for {}", streamId, this, failure); + LOG.atDebug().setCause(failure).log("Could not create local stream #{} for {}", streamId, this); failFn.accept(failure); return null; } @@ -1045,7 +1045,7 @@ protected HTTP2Stream createRemoteStream(int streamId, MetaData.Request request) { IllegalStateException failure = new IllegalStateException("Max remote stream count " + maxCount + " exceeded: " + remoteCount + "+" + remoteClosing); if (LOG.isDebugEnabled()) - LOG.debug("Could not create remote stream #{} for {}", streamId, this, failure); + LOG.atDebug().setCause(failure).log("Could not create remote stream #{} for {}", streamId, this); reset(null, new ResetFrame(streamId, ErrorCode.REFUSED_STREAM_ERROR.code), Callback.from(() -> onStreamDestroyed(streamId))); return null; } @@ -1837,7 +1837,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("OnReset failed", x); + LOG.atDebug().setCause(x).log("OnReset failed"); complete(); } @@ -2315,7 +2315,7 @@ private void onSessionFailure(int error, String reason, Callback callback) default -> { if (LOG.isDebugEnabled()) - LOG.debug("Already closed, ignored session failure {}", HTTP2Session.this, failure); + LOG.atDebug().setCause(failure).log("Already closed, ignored session failure {}", HTTP2Session.this); callback.succeeded(); return; } @@ -2323,7 +2323,7 @@ private void onSessionFailure(int error, String reason, Callback callback) } if (LOG.isDebugEnabled()) - LOG.debug("Session failure {}", HTTP2Session.this, cause); + LOG.atDebug().setCause(cause).log("Session failure {}", HTTP2Session.this); Invocable.InvocationType invocationType = callback.getInvocationType(); notifyFailure(HTTP2Session.this, cause, Callback.from(invocationType, () -> @@ -2352,7 +2352,7 @@ private void onWriteFailure(Throwable x) } if (LOG.isDebugEnabled()) - LOG.debug("Write failure {}", HTTP2Session.this, x); + LOG.atDebug().setCause(x).log("Write failure {}", HTTP2Session.this); int error = ErrorCode.NO_ERROR.code; notifyFailure(HTTP2Session.this, x, Callback.from(() -> diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java index 502db5b55a64..a166a0c05c21 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java @@ -153,7 +153,7 @@ public void close(Throwable cause) if (closed.compareAndSet(false, true)) { if (LOG.isDebugEnabled()) - LOG.debug("closing {}", this, cause); + LOG.atDebug().setCause(cause).log("closing {}", this); Stream.Data data = this.data.getAndSet(null); if (data != null) data.release(); diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java index 16f143843a20..298f515d5fd8 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java @@ -274,14 +274,14 @@ protected Action process() throws Throwable catch (HpackException.StreamException failure) { if (LOG.isDebugEnabled()) - LOG.debug("Failure generating {}", entry, failure); + LOG.atDebug().setCause(failure).log("Failure generating {}", entry); entry.resetAndFail(failure); pending.remove(); } catch (HpackException.SessionException failure) { if (LOG.isDebugEnabled()) - LOG.debug("Failure generating {}", entry, failure); + LOG.atDebug().setCause(failure).log("Failure generating {}", entry); onSessionFailure(failure); // The method above will try to send // a GOAWAY, so we will iterate again. @@ -291,7 +291,7 @@ protected Action process() throws Throwable { // Failure to generate the entry is catastrophic. if (LOG.isDebugEnabled()) - LOG.debug("Failure generating {}", entry, failure); + LOG.atDebug().setCause(failure).log("Failure generating {}", entry); failed(failure); return Action.SCHEDULED; } @@ -382,11 +382,11 @@ protected void onFailure(Throwable x) closed = terminated; terminated = x; if (LOG.isDebugEnabled()) - LOG.debug(String.format("%s, entries processed/pending/queued=%d/%d/%d", + LOG.atDebug().setCause(x).log(String.format("%s, entries processed/pending/queued=%d/%d/%d", closed != null ? "Closing" : "Failing", processedEntries.size(), pendingEntries.size(), - entries.size()), x); + entries.size())); allEntries = new HashSet<>(entries); entries.clear(); } @@ -420,11 +420,11 @@ private void onSessionFailure(Throwable x) closed = terminated; terminated = x; if (LOG.isDebugEnabled()) - LOG.debug(String.format("%s, entries processed/pending/queued=%d/%d/%d", + LOG.atDebug().setCause(x).log(String.format("%s, entries processed/pending/queued=%d/%d/%d", closed != null ? "Closing" : "Failing", processedEntries.size(), pendingEntries.size(), - entries.size()), x); + entries.size())); allEntries = new HashSet<>(entries); entries.clear(); } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockParser.java index 0f8d63eeeda7..ad26ebb8e096 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockParser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockParser.java @@ -102,7 +102,7 @@ public MetaData parse(ByteBuffer buffer, int blockLength) catch (HpackException.StreamException x) { if (LOG.isDebugEnabled()) - LOG.debug("Stream error, stream={}", headerParser.getStreamId(), x); + LOG.atDebug().setCause(x).log("Stream error, stream={}", headerParser.getStreamId()); if (x.isRequest()) return MetaData.Failed.newFailedMetaDataRequest(HttpVersion.HTTP_2, x); if (x.isResponse()) @@ -112,14 +112,14 @@ public MetaData parse(ByteBuffer buffer, int blockLength) catch (HpackException.CompressionException x) { if (LOG.isDebugEnabled()) - LOG.debug("Compression error, buffer={}", BufferUtil.toDetailString(buffer), x); + LOG.atDebug().setCause(x).log("Compression error, buffer={}", BufferUtil.toDetailString(buffer)); notifier.connectionFailure(buffer, ErrorCode.COMPRESSION_ERROR.code, "invalid_hpack_block"); return MetaData.Failed.newFailedMetaData(HttpVersion.HTTP_2, x); } catch (HpackException.SessionException x) { if (LOG.isDebugEnabled()) - LOG.debug("Session error, buffer={}", BufferUtil.toDetailString(buffer), x); + LOG.atDebug().setCause(x).log("Session error, buffer={}", BufferUtil.toDetailString(buffer)); notifier.connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_hpack_block"); return MetaData.Failed.newFailedMetaData(HttpVersion.HTTP_2, x); } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java index d90e81c106bd..e719c5d84143 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java @@ -175,7 +175,7 @@ public void parse(ByteBuffer buffer) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Parse failed", x); + LOG.atDebug().setCause(x).log("Parse failed"); connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR, "parser_error"); } } diff --git a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java index 61b17b183e93..83022f66eb55 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java +++ b/jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java @@ -130,7 +130,7 @@ public void parse(ByteBuffer buffer) } catch (Throwable x) { - LOG.debug("Parse error", x); + LOG.atDebug().setCause(x).log("Parse error"); BufferUtil.clear(buffer); notifyConnectionFailure(ErrorCode.PROTOCOL_ERROR.code, "parser_error"); } diff --git a/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java index 7e6eab324c1a..c484c17804af 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java +++ b/jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java @@ -211,7 +211,7 @@ public void onStreamTimeout(Stream stream, TimeoutException timeout, Promise co public Runnable onFailure(Throwable failure, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("failure on {}", this, failure); + LOG.atDebug().setCause(failure).log("failure on {}", this); processFailure(failure); close(failure); return callback::succeeded; diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3SessionClient.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3SessionClient.java index cfe9d5bd9c4b..12b74a3919ea 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3SessionClient.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3SessionClient.java @@ -132,7 +132,7 @@ public void newRequest(HeadersFrame frame, Stream.Client.Listener listener, Prom catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not create stream for {} on {}", endPoint, this, x); + LOG.atDebug().setCause(x).log("could not create stream for {} on {}", endPoint, this); Promise.Invocable p = Promise.Invocable.from(promise.getInvocationType(), s -> promise.failed(x), t -> promise.failed(x)); endPoint.disconnect(HTTP3ErrorCode.REQUEST_CANCELLED_ERROR.code(), x, true, p); return; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java index 2d44120e9db4..1b58948e0b2d 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java @@ -125,7 +125,7 @@ protected void onSuccess() protected void onFailure(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("failed to write {} on {}", entries, this, failure); + LOG.atDebug().setCause(failure).log("failed to write {} on {}", entries, this); List allEntries = new ArrayList<>(entries); entries.clear(); diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3StreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3StreamConnection.java index 587e95e1c1bc..8b48ad55cb6b 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3StreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3StreamConnection.java @@ -84,7 +84,7 @@ public void onClose(Throwable cause) public void onFailure(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("onFailure on {}", this, failure); + LOG.atDebug().setCause(failure).log("onFailure on {}", this); tryReleaseData(true); } @@ -196,7 +196,7 @@ private void processFrames(ParseResult result) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure processing frames on {}", this, x); + LOG.atDebug().setCause(x).log("failure processing frames on {}", this); tryReleaseData(true); throw x; } @@ -299,7 +299,7 @@ private Content.Chunk read(ParseResult result) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure reading data on {}", this, x); + LOG.atDebug().setCause(x).log("failure reading data on {}", this); tryReleaseData(true); return Content.Chunk.from(x); } @@ -349,7 +349,7 @@ private ParseResult parseAndFill() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("parse+fill failure on {}", this, x); + LOG.atDebug().setCause(x).log("parse+fill failure on {}", this); throw x; } } diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java index 9b0290f998b0..baf90d4ebb3f 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java @@ -122,7 +122,7 @@ protected void onCompleteSuccess() protected void onFailure(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("failed to write buffers on {}", this, failure); + LOG.atDebug().setCause(failure).log("failed to write buffers on {}", this); try (AutoLock ignored = lock.lock()) { diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionStreamConnection.java index a09fbecb0de1..3e018ddaf092 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionStreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionStreamConnection.java @@ -122,7 +122,7 @@ private void fail(long errorCode, String message, Throwable failure) buffer.release(); buffer = null; if (LOG.isDebugEnabled()) - LOG.debug("could not process instruction stream {}", getEndPoint(), failure); + LOG.atDebug().setCause(failure).log("could not process instruction stream {}", getEndPoint()); notifySessionFailure(errorCode, message, failure); } diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java index d1f76d50860e..1edaee6affec 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java @@ -85,7 +85,7 @@ protected Action process() private void onGenerateFailure(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("failed to generate {} on {}", entry, this, cause); + LOG.atDebug().setCause(cause).log("failed to generate {} on {}", entry, this); accumulator.release(); @@ -112,7 +112,7 @@ private void onWriteSuccess() private void onWriteFailure(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("failed to write {} on {}", entry, this, failure); + LOG.atDebug().setCause(failure).log("failed to write {} on {}", entry, this); accumulator.release(); diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/UnidirectionalStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/UnidirectionalStreamConnection.java index 210476b1a286..42bdd7af9b18 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/UnidirectionalStreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/UnidirectionalStreamConnection.java @@ -127,7 +127,7 @@ else if (filled == 0) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not process stream {}", getEndPoint(), x); + LOG.atDebug().setCause(x).log("could not process stream {}", getEndPoint()); releaseBuffer(); getEndPoint().close(x); } diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java index 4f7922fa3631..ddfea336a135 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java @@ -118,7 +118,7 @@ else if (filled < 0) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not process control stream {}", getEndPoint(), x); + LOG.atDebug().setCause(x).log("could not process control stream {}", getEndPoint()); buffer.release(); buffer = null; getEndPoint().disconnect(HTTP3ErrorCode.CLOSED_CRITICAL_STREAM_ERROR.code(), x, true, Promise.Invocable.noop()); diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ControlParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ControlParser.java index 041ce5a406ac..bd8e908f0ebb 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ControlParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ControlParser.java @@ -134,7 +134,7 @@ public void parse(ByteBuffer buffer) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("parse failed", x); + LOG.atDebug().setCause(x).log("parse failed"); sessionFailure(buffer, HTTP3ErrorCode.INTERNAL_ERROR.code(), "parser_error", x); } } diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeadersBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeadersBodyParser.java index d74362c8a3c3..ff56b7cddf05 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeadersBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeadersBodyParser.java @@ -123,7 +123,7 @@ private boolean decode(ByteBuffer encoded, boolean last) catch (QpackException.StreamException x) { if (LOG.isDebugEnabled()) - LOG.debug("decode failure", x); + LOG.atDebug().setCause(x).log("decode failure"); // TODO: handle stream exceptions in other cases (see https://github.com/jetty/jetty.project/issues/7676). decoder.streamCancellation(streamId); @@ -139,13 +139,13 @@ else if (x.isResponse()) catch (QpackException.SessionException x) { if (LOG.isDebugEnabled()) - LOG.debug("decode failure", x); + LOG.atDebug().setCause(x).log("decode failure"); notifySessionFailure(x.getErrorCode(), x.getMessage(), x); } catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("decode failure", x); + LOG.atDebug().setCause(x).log("decode failure"); notifySessionFailure(HTTP3ErrorCode.INTERNAL_ERROR.code(), "internal_error", x); } return false; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MessageParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MessageParser.java index 3dcdc3044bad..561e25bdb7df 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MessageParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MessageParser.java @@ -186,7 +186,7 @@ public Result parse(ByteBuffer buffer, boolean last) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("parse failed", x); + LOG.atDebug().setCause(x).log("parse failed"); sessionFailure(buffer, HTTP3ErrorCode.INTERNAL_ERROR.code(), "parser_error", x); return Result.NO_FRAME; } diff --git a/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncodedFieldSection.java b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncodedFieldSection.java index 2285e4bde9dc..43b9258d021e 100644 --- a/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncodedFieldSection.java +++ b/jetty-core/jetty-http3/jetty-http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/internal/parser/EncodedFieldSection.java @@ -128,7 +128,7 @@ public MetaData decode(QpackContext context, int maxHeaderSize) throws QpackExce catch (QpackException.StreamException x) { if (LOG.isDebugEnabled()) - LOG.debug("Stream decode error, stream={}", getStreamId(), x); + LOG.atDebug().setCause(x).log("Stream decode error, stream={}", getStreamId()); if (x.isRequest()) return MetaData.Failed.newFailedMetaDataRequest(HttpVersion.HTTP_3, x); if (x.isResponse()) @@ -138,7 +138,7 @@ public MetaData decode(QpackContext context, int maxHeaderSize) throws QpackExce catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Stream decode failure, stream={}", getStreamId(), x); + LOG.atDebug().setCause(x).log("Stream decode failure, stream={}", getStreamId()); return MetaData.Failed.newFailedMetaData(HttpVersion.HTTP_3, x); } } diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java index 0d4a6b8820a5..5cbc1798320f 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java @@ -139,7 +139,7 @@ public void run() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("onRequest() failure", x); + LOG.atDebug().setCause(x).log("onRequest() failure"); HttpException httpException = x instanceof HttpException http ? http : new HttpException.RuntimeException(HttpStatus.INTERNAL_SERVER_ERROR_500, x); return onBadMessage(httpException); } @@ -552,7 +552,7 @@ public void failed(Throwable x) { HTTP3ErrorCode errorCode = x == HttpStream.CONTENT_NOT_CONSUMED ? HTTP3ErrorCode.NO_ERROR : HTTP3ErrorCode.REQUEST_CANCELLED_ERROR; if (LOG.isDebugEnabled()) - LOG.debug("HTTP3 Response #{}/{} failed {}", stream.getId(), Integer.toHexString(stream.getSession().hashCode()), errorCode, x); + LOG.atDebug().setCause(x).log("HTTP3 Response #{}/{} failed {}", stream.getId(), Integer.toHexString(stream.getSession().hashCode()), errorCode); stream.disconnect(errorCode.code(), x, Promise.Invocable.noop()); } diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java index a570dc4757ea..178ea21463e5 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java @@ -135,7 +135,7 @@ public boolean isFillInterested() public void onFillInterestedFailed(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("onFillInterestedFailed {}", this, cause); + LOG.atDebug().setCause(cause).log("onFillInterestedFailed {}", this); if (_endPoint.isOpen()) { boolean close = true; @@ -197,7 +197,7 @@ public void onClose(Throwable cause) if (cause == null) LOG.debug("onClose {}", this); else - LOG.debug("onClose {}", this, cause); + LOG.atDebug().setCause(cause).log("onClose {}", this); } for (Listener listener : _listeners) { diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java index 292c3e486fc3..1d9b8e5badf1 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java @@ -134,7 +134,7 @@ public InvocationType getCallbackInvocationType() public boolean onFail(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("onFail {}", this, cause); + LOG.atDebug().setCause(cause).log("onFail {}", this); Callback callback = _interested.get(); if (callback != null && _interested.compareAndSet(callback, null)) { diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java index 4fd0603124a8..a0870d9bbb5b 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java @@ -216,7 +216,7 @@ protected void handleSelectFailure(Selector selector, Throwable failure) throws { LOG.info("Caught select() failure, trying to recover: {}", failure.toString()); if (LOG.isDebugEnabled()) - LOG.debug("", failure); + LOG.atDebug().setCause(failure).log(""); Selector newSelector = _selectorManager.newSelector(); for (SelectionKey oldKey : selector.keys()) @@ -238,7 +238,7 @@ protected void handleSelectFailure(Selector selector, Throwable failure) throws catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Could not transfer {}", channel, t); + LOG.atDebug().setCause(t).log("Could not transfer {}", channel); IO.close(channel); } } @@ -878,7 +878,7 @@ public void update(Selector selector) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not register channel after accept {}", channel, x); + LOG.atDebug().setCause(x).log("Could not register channel after accept {}", channel); failed(x); } } @@ -894,7 +894,7 @@ public void run() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not process accepted channel {}", channel, x); + LOG.atDebug().setCause(x).log("Could not process accepted channel {}", channel); failed(x); } } @@ -1062,7 +1062,7 @@ public void run() IO.close(_connect.channel); LOG.warn("Could not create EndPoint {}: {}", _connect.channel, String.valueOf(failure)); if (LOG.isDebugEnabled()) - LOG.debug("", failure); + LOG.atDebug().setCause(failure).log(""); _connect.failed(failure); } } diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java index fe53eabe6ba3..6c37b09d48c7 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java @@ -109,7 +109,7 @@ private int fill() } catch (IOException x) { - LOG.debug("Unable to fill from endpoint", x); + LOG.atDebug().setCause(x).log("Unable to fill from endpoint"); close(); return -1; } @@ -124,7 +124,7 @@ private void replaceConnection() } catch (Throwable x) { - LOG.debug("Unable to replace connection", x); + LOG.atDebug().setCause(x).log("Unable to replace connection"); close(); } } diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectableChannelEndPoint.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectableChannelEndPoint.java index 1eb0a151d40d..06411813f540 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectableChannelEndPoint.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectableChannelEndPoint.java @@ -300,7 +300,7 @@ public void updateKey() catch (CancelledKeyException x) { if (LOG.isDebugEnabled()) - LOG.debug("Ignoring key update for cancelled key {}", this, x); + LOG.atDebug().setCause(x).log("Ignoring key update for cancelled key {}", this); close(); } catch (Throwable x) diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java index 55b187a54e07..1d9918537f8d 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java @@ -345,7 +345,7 @@ public void connectionOpened(Connection connection, Object context) if (isRunning()) LOG.warn("Exception while notifying connection {}", connection, x); else - LOG.debug("Exception while notifying connection {}", connection, x); + LOG.atDebug().setCause(x).log("Exception while notifying connection {}", connection); throw x; } } @@ -365,7 +365,7 @@ public void connectionClosed(Connection connection, Throwable cause) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while notifying connection {}", connection, x); + LOG.atDebug().setCause(x).log("Exception while notifying connection {}", connection); } } diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java index 0218bcb25fcf..1785d7e50206 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java @@ -67,7 +67,7 @@ protected void doShutdownOutput() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not shutdown output for {}", getChannel(), x); + LOG.atDebug().setCause(x).log("Could not shutdown output for {}", getChannel()); } } diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java index 563aae8b581d..4ecfda396acd 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java @@ -533,7 +533,7 @@ public boolean onFail(Throwable cause) case PENDING: if (LOG.isDebugEnabled()) - LOG.debug("failed: {}", this, cause); + LOG.atDebug().setCause(cause).log("failed: {}", this); PendingState pending = (PendingState)current; if (updateState(pending, new FailedState(cause))) @@ -546,7 +546,7 @@ public boolean onFail(Throwable cause) case FLUSHING: case COMPLETING: if (LOG.isDebugEnabled()) - LOG.debug("failed: {}", this, cause); + LOG.atDebug().setCause(cause).log("failed: {}", this); if (updateState(current, new FailedState(cause))) return true; break; diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/ContentSourceTransformer.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/ContentSourceTransformer.java index a49dadc20c88..402dd023b528 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/ContentSourceTransformer.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/ContentSourceTransformer.java @@ -226,7 +226,7 @@ public void demand(Runnable demandCallback) public void fail(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("Failing {}", this, failure); + LOG.atDebug().setCause(failure).log("Failing {}", this); while (true) { diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java index 087e92ceca26..5a1c78aa17a3 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java @@ -636,7 +636,7 @@ protected void onFillableFail(Throwable failure) try (AutoLock ignored = _lock.lock()) { if (LOG.isDebugEnabled()) - LOG.debug("onFillableFail {}", SslConnection.this, failure); + LOG.atDebug().setCause(failure).log("onFillableFail {}", SslConnection.this); _fillState = FillState.IDLE; if (_flushState == FlushState.WAIT_FOR_FILL) @@ -987,7 +987,7 @@ else if (interest) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(SslConnection.this.toString(), x); + LOG.atDebug().setCause(x).log(SslConnection.this.toString()); close(x); throw x; } @@ -1016,7 +1016,7 @@ private Throwable handshakeFailed(Throwable failure) if (_handshake.compareAndSet(HandshakeState.HANDSHAKE, HandshakeState.FAILED)) { if (LOG.isDebugEnabled()) - LOG.debug("handshake failed {}", SslConnection.this, failure); + LOG.atDebug().setCause(failure).log("handshake failed {}", SslConnection.this); if (!(failure instanceof SSLHandshakeException)) failure = new SSLHandshakeException(failure.getMessage()).initCause(failure); notifyHandshakeFailed(_sslEngine, failure); @@ -1350,7 +1350,7 @@ else if (fillInterest) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(SslConnection.this.toString(), x); + LOG.atDebug().setCause(x).log(SslConnection.this.toString()); close(x); throw x; } @@ -1448,7 +1448,7 @@ private void closeOutbound() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to close outbound", x); + LOG.atDebug().setCause(x).log("Unable to close outbound"); } } @@ -1606,13 +1606,13 @@ private Throwable handleException(Throwable x, String context) { _failure = x; if (LOG.isDebugEnabled()) - LOG.debug("{} stored {} exception", this, context, x); + LOG.atDebug().setCause(x).log("{} stored {} exception", this, context); } else { ExceptionUtil.addSuppressedIfNotAssociated(_failure, x); if (LOG.isDebugEnabled()) - LOG.debug("{} suppressed {} exception", this, context, x); + LOG.atDebug().setCause(x).log("{} suppressed {} exception", this, context); } return _failure; } @@ -1681,7 +1681,7 @@ public void failed(final Throwable x) try (AutoLock ignored = _lock.lock()) { if (LOG.isDebugEnabled()) - LOG.debug("IncompleteWriteCB failed {}", SslConnection.this, x); + LOG.atDebug().setCause(x).log("IncompleteWriteCB failed {}", SslConnection.this); lockedDiscardEncryptedOutputBuffer(); diff --git a/jetty-core/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java b/jetty-core/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java index 07b77d7d3632..b2513fe71628 100644 --- a/jetty-core/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java +++ b/jetty-core/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java @@ -150,7 +150,7 @@ public AttributeList getAttributes(String[] names) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to get attribute {}", name, x); + LOG.atDebug().setCause(x).log("Unable to get attribute {}", name); } } return results; @@ -184,7 +184,7 @@ public AttributeList setAttributes(AttributeList attributes) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to get Attribute {}", attribute, x); + LOG.atDebug().setCause(x).log("Unable to get Attribute {}", attribute); } } return results; diff --git a/jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java b/jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java index c7769d306c7d..607b9500de52 100644 --- a/jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java +++ b/jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java @@ -681,7 +681,7 @@ public void succeeded() public void failed(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("{} P2C failed to write content {}", requestId(clientToProxyRequest), BufferUtil.toDetailString(serverToProxyContent), failure); + LOG.atDebug().setCause(failure).log("{} P2C failed to write content {}", requestId(clientToProxyRequest), BufferUtil.toDetailString(serverToProxyContent)); serverToProxyChunk.release(); // Cannot write towards the client, abort towards the server. serverToProxyResponse.abort(failure); @@ -720,7 +720,7 @@ public void onComplete(Result result) else { if (LOG.isDebugEnabled()) - LOG.debug("{} P2C response failure {}", requestId(clientToProxyRequest), proxyToClientResponse, failure); + LOG.atDebug().setCause(failure).log("{} P2C response failure {}", requestId(clientToProxyRequest), proxyToClientResponse); onProxyToClientResponseFailure(clientToProxyRequest, proxyToServerRequest, result.getResponse(), proxyToClientResponse, proxyToClientCallback, failure); } }); @@ -763,7 +763,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("{} P2C response failure {}", requestId(clientToProxyRequest), proxyToClientResponse, x); + LOG.atDebug().setCause(x).log("{} P2C response failure {}", requestId(clientToProxyRequest), proxyToClientResponse); onProxyToClientResponseFailure(clientToProxyRequest, proxyToServerRequest, serverToProxyResponse, proxyToClientResponse, proxyToClientCallback, x); } diff --git a/jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java b/jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java index 1df700df80a6..b2c5570100d1 100644 --- a/jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java +++ b/jetty-core/jetty-quic/jetty-quic-client/src/main/java/org/eclipse/jetty/quic/client/ClientProtocolSession.java @@ -62,7 +62,7 @@ protected void onStart() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not create stream", x); + LOG.atDebug().setCause(x).log("could not create stream"); ConnectionCloseFrame disconnect = new ConnectionCloseFrame(ErrorCode.INTERNAL_ERROR.code(), "start_failure"); disconnect(disconnect, x, Promise.Invocable.noop()); } diff --git a/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/AbstractSession.java b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/AbstractSession.java index 20a111bd3058..d61122d00163 100644 --- a/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/AbstractSession.java +++ b/jetty-core/jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/AbstractSession.java @@ -127,7 +127,7 @@ protected Stream.Listener notifyNewStream() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); return null; } } @@ -141,7 +141,7 @@ protected TransportParameters notifyPrepare() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); return null; } } @@ -155,7 +155,7 @@ protected void notifyTransportParameters(TransportParameters parameters) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -168,7 +168,7 @@ protected void notifyMaxStreams(MaxStreamsFrame frame) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -181,7 +181,7 @@ protected void notifyDataBlocked(DataBlockedFrame frame) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -194,7 +194,7 @@ protected void notifyMaxData(MaxDataFrame frame) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -207,7 +207,7 @@ protected void notifyPing() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -220,7 +220,7 @@ protected void notifyStreamsBlocked(StreamsBlockedFrame frame) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } @@ -235,7 +235,7 @@ private CompletableFuture notifyLocalShutdown() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); return CompletableFuture.failedFuture(x); } } @@ -249,7 +249,7 @@ protected boolean notifyIdleTimeout(TimeoutException failure) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); return true; } } @@ -266,7 +266,7 @@ protected void notifyLocalClose(ConnectionCloseFrame frame, Promise.Invocable promise) { if (LOG.isDebugEnabled()) - LOG.debug("disconnecting with {} on {}", frame, this, failure); + LOG.atDebug().setCause(failure).log("disconnecting with {} on {}", frame, this); // Terminate all the StreamEndPoints. // This clears the endPoints map of this class. for (StreamEndPoint streamEndPoint : getStreamEndPoints()) diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/QuicheClientQuicConfiguration.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/QuicheClientQuicConfiguration.java index 373a8667a3fe..a5e6ff3e9b5a 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/QuicheClientQuicConfiguration.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/QuicheClientQuicConfiguration.java @@ -130,7 +130,7 @@ private void deleteFile(Path path) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not delete {}", path, x); + LOG.atDebug().setCause(x).log("could not delete {}", path); } } } diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/QuicheTransport.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/QuicheTransport.java index fbcba8c46530..a5bcb064ae8c 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/QuicheTransport.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/QuicheTransport.java @@ -121,7 +121,7 @@ public void onOpen(Session session) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not create ProtocolSession", x); + LOG.atDebug().setCause(x).log("could not create ProtocolSession"); session.disconnect(new ConnectionCloseFrame(ErrorCode.APPLICATION_ERROR.code(), "invalid_protocol"), x, Promise.Invocable.noop()); } } diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/internal/ClientQuicheConnection.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/internal/ClientQuicheConnection.java index 191e324b177d..2fa01ca859c7 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/internal/ClientQuicheConnection.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-client/src/main/java/org/eclipse/jetty/quic/quiche/client/internal/ClientQuicheConnection.java @@ -229,7 +229,7 @@ public void onFillable() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("receive failure on {}", this, x); + LOG.atDebug().setCause(x).log("receive failure on {}", this); buffer.release(); fail(ErrorCode.INTERNAL_ERROR.code(), "receive_failure", x); } diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheSession.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheSession.java index e700058ecfd3..e217407300fe 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheSession.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheSession.java @@ -214,7 +214,7 @@ public void maxData(MaxDataFrame frame, Promise.Invocable promise) public void disconnect(ConnectionCloseFrame frame, Throwable failure, Promise.Invocable promise) { if (LOG.isDebugEnabled()) - LOG.debug("disconnecting {} {}", frame, this, failure); + LOG.atDebug().setCause(failure).log("disconnecting {} {}", frame, this); // Terminate all the streams. // This clears the streams map of this class. @@ -551,7 +551,7 @@ protected void onCompleteSuccess() protected void onCompleteFailure(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("failed to write cipher bytes, closing session on {}", QuicheSession.this, failure); + LOG.atDebug().setCause(failure).log("failed to write cipher bytes, closing session on {}", QuicheSession.this); complete(failure); } diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheStream.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheStream.java index 2947db4a3382..8842371b3a48 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheStream.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/src/main/java/org/eclipse/jetty/quic/quiche/QuicheStream.java @@ -179,7 +179,7 @@ public Content.Chunk read() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure reading from {}", this, x); + LOG.atDebug().setCause(x).log("failure reading from {}", this); Content.Chunk failure; try (AutoLock ignored = lock.lock()) diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/QuicheServerConnectionFactory.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/QuicheServerConnectionFactory.java index 3a57caa91476..a4765147c579 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/QuicheServerConnectionFactory.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/QuicheServerConnectionFactory.java @@ -95,7 +95,7 @@ public void onOpen(Session session) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not create ProtocolSession", x); + LOG.atDebug().setCause(x).log("could not create ProtocolSession"); session.disconnect(new ConnectionCloseFrame(ErrorCode.APPLICATION_ERROR.code(), "invalid_protocol"), x, Promise.Invocable.noop()); } } diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/QuicheServerQuicConfiguration.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/QuicheServerQuicConfiguration.java index 20c1168e99aa..ff2fc5e84fd2 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/QuicheServerQuicConfiguration.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/QuicheServerQuicConfiguration.java @@ -102,7 +102,7 @@ private void deleteFile(Path path) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("could not delete {}", path, x); + LOG.atDebug().setCause(x).log("could not delete {}", path); } } } diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/internal/ServerQuicheConnection.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/internal/ServerQuicheConnection.java index f25d50b32126..757b165acd19 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/internal/ServerQuicheConnection.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/internal/ServerQuicheConnection.java @@ -191,7 +191,7 @@ private Runnable produce() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("produce() failure", x); + LOG.atDebug().setCause(x).log("produce() failure"); buffer.release(); fail(x); return null; @@ -371,7 +371,7 @@ public void disconnect(QuicheSession session, ConnectionCloseFrame frame, Throwa private void fail(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("failing connection {}", this, failure); + LOG.atDebug().setCause(failure).log("failing connection {}", this); ConnectionCloseFrame frame = new ConnectionCloseFrame(ErrorCode.INTERNAL_ERROR.code(), "failure"); for (ServerQuicheSession session : sessions.values()) { diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/internal/ServerQuicheSession.java b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/internal/ServerQuicheSession.java index 157f669ca25e..da729444e9ab 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/internal/ServerQuicheSession.java +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-server/src/main/java/org/eclipse/jetty/quic/quiche/server/internal/ServerQuicheSession.java @@ -16,7 +16,6 @@ import java.io.IOException; import java.net.SocketAddress; import java.nio.ByteBuffer; -import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLong; import javax.net.ssl.SSLHandshakeException; @@ -30,7 +29,6 @@ import org.eclipse.jetty.quic.quiche.server.QuicheServerQuicConfiguration; import org.eclipse.jetty.quic.util.ErrorCode; import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.util.NanoTime; import org.eclipse.jetty.util.Promise; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.thread.Invocable; @@ -129,7 +127,7 @@ Runnable process(SocketAddress remoteAddress, ByteBuffer cipherBuffer) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("process failure for {}", this, x); + LOG.atDebug().setCause(x).log("process failure for {}", this); ConnectionCloseFrame frame = new ConnectionCloseFrame(ErrorCode.CONNECTION_REFUSED_ERROR.code(), "session_failure"); disconnect(frame, x, Promise.Invocable.noop()); return null; diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java index 7927a408ebc2..1ee2ff370429 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java @@ -97,7 +97,7 @@ public void open() throws IOException catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } } @@ -117,7 +117,7 @@ public void close() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("failure while notifying listener {}", listener, x); + LOG.atDebug().setCause(x).log("failure while notifying listener {}", listener); } } } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AllowedResourceAliasChecker.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AllowedResourceAliasChecker.java index 7f8f0780738b..81987075a860 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AllowedResourceAliasChecker.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AllowedResourceAliasChecker.java @@ -155,7 +155,7 @@ public boolean checkAlias(String pathInContext, Resource resource) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Failed to check alias", t); + LOG.atDebug().setCause(t).log("Failed to check alias"); return false; } } @@ -234,7 +234,7 @@ protected boolean isSameFile(Path path1, Path path2) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("ignored", t); + LOG.atDebug().setCause(t).log("ignored"); } return false; } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionLimit.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionLimit.java index fd45f2d03333..a08e3acdfc31 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionLimit.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionLimit.java @@ -265,7 +265,7 @@ public void onAcceptFailed(SelectableChannel channel, Throwable cause) { _accepting--; if (LOG.isDebugEnabled()) - LOG.debug("Accept failed ({}+{}) <= {} {}", _accepting, _connections, _maxConnections, channel, cause); + LOG.atDebug().setCause(cause).log("Accept failed ({}+{}) <= {} {}", _accepting, _connections, _maxConnections, channel); check(); } } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java index 1c3d791db2d5..b16d1f5056d9 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java @@ -270,7 +270,7 @@ private boolean detectAndUpgrade() { // It's just bubbling up from a nested Detector, so it's already handled, just rethrow it. if (LOG.isDebugEnabled()) - LOG.debug("Detector {} failed to upgrade, rethrowing", getProtocol(), x); + LOG.atDebug().setCause(x).log("Detector {} failed to upgrade, rethrowing", getProtocol()); throw x; } catch (Throwable x) diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java index 7c9db3ee8713..57b845da5d51 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java @@ -148,7 +148,7 @@ private int fill() } catch (IOException x) { - LOG.debug("Unable to fill from endpoint {}", getEndPoint(), x); + LOG.atDebug().setCause(x).log("Unable to fill from endpoint {}", getEndPoint()); close(); return -1; } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/NetworkConnectionLimit.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/NetworkConnectionLimit.java index 1b842daf89d5..7615fc8cd7e9 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/NetworkConnectionLimit.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/NetworkConnectionLimit.java @@ -261,7 +261,7 @@ public void onAcceptFailed(SelectableChannel channel, Throwable cause) { _pendingConnections--; if (LOG.isDebugEnabled()) - LOG.debug("Accept failed ({}+{}) <= {} {}", _pendingConnections, _connections, _maxNetworkConnections, channel, cause); + LOG.atDebug().setCause(cause).log("Accept failed ({}+{}) <= {} {}", _pendingConnections, _connections, _maxNetworkConnections, channel); lockedCheck(); } } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java index f32b8d15bb8f..d91be833d203 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java @@ -362,7 +362,7 @@ private void setSocketOption(ServerSocketChannel channel, SocketOption op catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not configure {} to {} on {}", option, value, channel, x); + LOG.atDebug().setCause(x).log("Could not configure {} to {} on {}", option, value, channel); } } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownService.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownService.java index 4af91010b3ce..e5c1706cfc13 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownService.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownService.java @@ -400,13 +400,13 @@ public void run() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Failed to handle incoming shutdown client", x); + LOG.atDebug().setCause(x).log("Failed to handle incoming shutdown client"); } } } catch (Throwable x) { - LOG.debug("Failed ServerSocket", x); + LOG.atDebug().setCause(x).log("Failed ServerSocket"); } finally { @@ -448,7 +448,7 @@ private void stopComponents(boolean destroy) } catch (Throwable x) { - LOG.debug("Unable to stop component: {}", component, x); + LOG.atDebug().setCause(x).log("Unable to stop component: {}", component); } } } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/SymlinkAllowedResourceAliasChecker.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/SymlinkAllowedResourceAliasChecker.java index f483239a5a4d..8e93c7ee2ee8 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/SymlinkAllowedResourceAliasChecker.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/SymlinkAllowedResourceAliasChecker.java @@ -116,7 +116,7 @@ protected boolean check(String pathInContext, Path path) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Failed to check alias", t); + LOG.atDebug().setCause(t).log("Failed to check alias"); return false; } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java index 3c35075ae065..a09e00d54c32 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java @@ -344,7 +344,7 @@ protected void onConnectSuccess(ConnectContext connectContext, UpstreamConnectio protected void onConnectFailure(Request request, Response response, Callback callback, Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("CONNECT failed", failure); + LOG.atDebug().setCause(failure).log("CONNECT failed"); sendConnectResponse(request, response, callback, HttpStatus.INTERNAL_SERVER_ERROR_500); } @@ -369,7 +369,7 @@ private void sendConnectResponse(Request request, Response response, Callback ca catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not send CONNECT response", x); + LOG.atDebug().setCause(x).log("Could not send CONNECT response"); } } @@ -635,7 +635,7 @@ public void failed(Throwable x) { buffer = null; if (LOG.isDebugEnabled()) - LOG.debug("Failed to write initial {} bytes to server {}", remaining, DownstreamConnection.this, x); + LOG.atDebug().setCause(x).log("Failed to write initial {} bytes to server {}", remaining, DownstreamConnection.this); close(); getConnection().close(); } @@ -753,7 +753,7 @@ protected Action process() catch (IOException x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not fill {}", TunnelConnection.this, x); + LOG.atDebug().setCause(x).log("Could not fill {}", TunnelConnection.this); buffer.release(); disconnect(x); return Action.SUCCEEDED; @@ -772,7 +772,7 @@ protected void onSuccess() protected void onFailure(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Failed to write {} bytes {}", filled, TunnelConnection.this, x); + LOG.atDebug().setCause(x).log("Failed to write {} bytes {}", filled, TunnelConnection.this); disconnect(x); } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 31bcd931db8f..3e7f6c122cbe 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -757,11 +757,9 @@ protected ClassLoader enterScope(Request contextRequest) catch (Throwable x) { // Log as warning the first time it happens. - String msg = "Error setting a context classloader on thread {}"; - if (_enterScopeSetClassloaderFailed.compareAndSet(false, true)) - LOG.warn(msg, Thread.currentThread(), x); - else if (LOG.isDebugEnabled()) - LOG.debug(msg, Thread.currentThread(), x); + (_enterScopeSetClassloaderFailed.compareAndSet(false, true) ? LOG.atWarn() : LOG.atDebug()) + .setCause(x) + .log("Error setting a context classloader on thread {}", Thread.currentThread()); } } notifyEnterScope(contextRequest); diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/EventsHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/EventsHandler.java index 7912f42fd148..1e6decba0e68 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/EventsHandler.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/EventsHandler.java @@ -248,7 +248,7 @@ protected void onRequestRead(Request request, Content.Chunk chunk) protected void onAfterHandling(Request request, boolean handled, Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("onAfterHandling of {} handled={}", request, handled, failure); + LOG.atDebug().setCause(failure).log("onAfterHandling of {} handled={}", request, handled); } /** @@ -294,7 +294,7 @@ protected void onResponseWrite(Request request, boolean last, ByteBuffer content protected void onResponseWriteComplete(Request request, Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("onResponseWriteComplete of {}", request, failure); + LOG.atDebug().setCause(failure).log("onResponseWriteComplete of {}", request); } /** diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/QoSHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/QoSHandler.java index bbdddc05b94f..0feaa6d84f3f 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/QoSHandler.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/QoSHandler.java @@ -428,7 +428,7 @@ private void resume(Throwable x) if (permits > 0) { if (LOG.isDebugEnabled()) - LOG.debug("{} no suspended requests to resume", this, x); + LOG.atDebug().setCause(x).log("{} no suspended requests to resume", this); return; } @@ -558,7 +558,7 @@ public void run() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("{} failed {}", QoSHandler.this, request, x); + LOG.atDebug().setCause(x).log("{} failed {}", QoSHandler.this, request); failSuspended(request, response, callback, HttpStatus.INTERNAL_SERVER_ERROR_500, x); } } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/CompletionStreamWrapper.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/CompletionStreamWrapper.java index 7c720973c31e..22c49c091708 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/CompletionStreamWrapper.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/CompletionStreamWrapper.java @@ -49,7 +49,7 @@ public void succeeded() public void failed(Throwable x) { if (Request.LOG.isDebugEnabled()) - Request.LOG.debug("failed {}", this, x); + Request.LOG.atDebug().setCause(x).log("failed {}", this); onCompletion(x); super.failed(x); } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java index bc2280754cce..5fb5916f9ba5 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java @@ -355,7 +355,7 @@ public IdleTimeoutTask onIdleTimeout(TimeoutException t) try (AutoLock ignored = _lock.lock()) { if (LOG.isDebugEnabled()) - LOG.debug("onIdleTimeout {}", this, t); + LOG.atDebug().setCause(t).log("onIdleTimeout {}", this); // Either too early or too late. if (_stream == null || _request == null) @@ -433,7 +433,7 @@ private Runnable onFailure(Throwable x, boolean remote) try (AutoLock ignored = _lock.lock()) { if (LOG.isDebugEnabled()) - LOG.debug("onFailure {}", this, x); + LOG.atDebug().setCause(x).log("onFailure {}", this); // If the channel doesn't have a stream, then the error is ignored. stream = _stream; @@ -487,7 +487,7 @@ private Runnable onFailure(Throwable x, boolean remote) try { if (LOG.isDebugEnabled()) - LOG.debug("invoking failure listeners {} {}", HttpChannelState.this, onFailure, x); + LOG.atDebug().setCause(x).log("invoking failure listeners {} {}", HttpChannelState.this, onFailure); onFailure.accept(x); } catch (Throwable throwable) @@ -1384,7 +1384,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("write failed {}", this, x); + LOG.atDebug().setCause(x).log("write failed {}", this); Callback callback; HttpChannelState httpChannel; try (AutoLock ignored = _request._lock.lock()) @@ -1831,7 +1831,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("ErrorWrite failed: {}", this, x); + LOG.atDebug().setCause(x).log("ErrorWrite failed: {}", this); Throwable failure; HttpChannelState httpChannelState; try (AutoLock ignored = _request._lock.lock()) diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java index a6d63cbebd67..d06e2a4b5380 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java @@ -470,7 +470,7 @@ else if (_requestHandler._failure != null) try { if (LOG.isDebugEnabled()) - LOG.debug("caught exception {} {}", this, _httpChannel, x); + LOG.atDebug().setCause(x).log("caught exception {} {}", this, _httpChannel); if (_requestBuffer != null) releaseRequestBuffer(); } @@ -583,7 +583,7 @@ else if (filled < 0) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to fill from endpoint {}", getEndPoint(), x); + LOG.atDebug().setCause(x).log("Unable to fill from endpoint {}", getEndPoint()); _parser.atEOF(); return -1; } @@ -718,7 +718,7 @@ public void failed(Throwable x) { Runnable task = _httpChannel.onFailure(x); if (LOG.isDebugEnabled()) - LOG.debug("demand failed {}", task, x); + LOG.atDebug().setCause(x).log("demand failed {}", task); ThreadPool.executeImmediately(getConnector().getExecutor(), task); } @@ -1725,11 +1725,11 @@ public void failed(Throwable x) if (stream == null) { if (LOG.isDebugEnabled()) - LOG.debug("ignored", x); + LOG.atDebug().setCause(x).log("ignored"); return; } if (LOG.isDebugEnabled()) - LOG.debug("aborting", x); + LOG.atDebug().setCause(x).log("aborting"); abort(x); _httpChannel.setHttpStream(null); if (!_handling.compareAndSet(true, false)) diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java index 983728368d6c..b31952b14993 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java @@ -607,7 +607,7 @@ public final void failed(Throwable cause) try (AutoLock ignored = _lock.lock()) { if (LOG.isDebugEnabled()) - LOG.debug("failed {}", this, cause); + LOG.atDebug().setCause(cause).log("failed {}", this); switch (_state) { case PROCESSING: @@ -750,7 +750,7 @@ public final boolean abort(Throwable cause) try (AutoLock ignored = _lock.lock()) { if (LOG.isDebugEnabled()) - LOG.debug("abort {}", this, cause); + LOG.atDebug().setCause(cause).log("abort {}", this); // Are we already aborted? if (_aborted) diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java index f1fa75a5b1ef..22f78f6e6441 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java @@ -188,7 +188,7 @@ else if (_state instanceof BlockerTimeoutException || _state instanceof BlockerF if (LOG.isDebugEnabled()) { LOG.debug(msg, _state); - LOG.debug(msg, cause); + LOG.atDebug().setCause(cause).log(msg); } } } diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java index 6139a9f91583..b2497ea6a26b 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java @@ -457,7 +457,7 @@ public boolean isSameFile(Path path) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("ignored", t); + LOG.atDebug().setCause(t).log("ignored"); } return false; } diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java index 08081f0a53e3..0680fa008cb1 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java @@ -182,7 +182,7 @@ protected String chooseServerAlias(String keyType, Principal[] issuers, Collecti catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Failure matching X509 for SNI {}", host, x); + LOG.atDebug().setCause(x).log("Failure matching X509 for SNI {}", host); return null; } } diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java index e515ffd2b8ba..e4ddd4a643a2 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java @@ -1725,7 +1725,7 @@ protected CertificateFactory getCertificateFactoryInstance(String type) throws C { String msg = String.format("Unable to get CertificateFactory instance for type [%s] on provider [%s], using default", type, provider); if (LOG.isDebugEnabled()) - LOG.debug(msg, cause); + LOG.atDebug().setCause(cause).log(msg); } return CertificateFactory.getInstance(type); @@ -1745,7 +1745,7 @@ protected CertStore getCertStoreInstance(Collection crls) throws { String msg = String.format("Unable to get CertStore instance for type [%s] on provider [%s], using default", type, provider); if (LOG.isDebugEnabled()) - LOG.debug(msg, cause); + LOG.atDebug().setCause(cause).log(msg); } return CertStore.getInstance(type, new CollectionCertStoreParameters(crls)); @@ -1765,7 +1765,7 @@ protected KeyManagerFactory getKeyManagerFactoryInstance() throws NoSuchAlgorith { String msg = String.format("Unable to get KeyManagerFactory instance for algorithm [%s] on provider [%s], using default", algorithm, provider); if (LOG.isDebugEnabled()) - LOG.debug(msg, cause); + LOG.atDebug().setCause(cause).log(msg); } return KeyManagerFactory.getInstance(algorithm); @@ -1788,7 +1788,7 @@ protected SecureRandom getSecureRandomInstance() throws NoSuchAlgorithmException { String msg = String.format("Unable to get SecureRandom instance for algorithm [%s] on provider [%s], using default", algorithm, provider); if (LOG.isDebugEnabled()) - LOG.debug(msg, cause); + LOG.atDebug().setCause(cause).log(msg); } return SecureRandom.getInstance(algorithm); @@ -1811,7 +1811,7 @@ protected SSLContext getSSLContextInstance() throws NoSuchAlgorithmException { String msg = String.format("Unable to get SSLContext instance for protocol [%s] on provider [%s], using default", protocol, provider); if (LOG.isDebugEnabled()) - LOG.debug(msg, cause); + LOG.atDebug().setCause(cause).log(msg); } return SSLContext.getInstance(protocol); @@ -1830,7 +1830,7 @@ protected TrustManagerFactory getTrustManagerFactoryInstance() throws NoSuchAlgo { String msg = String.format("Unable to get TrustManagerFactory instance for algorithm [%s] on provider [%s], using default", algorithm, provider); if (LOG.isDebugEnabled()) - LOG.debug(msg, cause); + LOG.atDebug().setCause(cause).log(msg); } return TrustManagerFactory.getInstance(algorithm); diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java index 830c71f2ddab..daf49363f584 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java @@ -319,7 +319,7 @@ public void run() catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("{} task {} failure", ReservedThreadExecutor.this, task, t); + LOG.atDebug().setCause(t).log("{} task {} failure", ReservedThreadExecutor.this, task); } finally { @@ -332,7 +332,7 @@ public void run() catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("{} reservedThread {} failure", ReservedThreadExecutor.this, this, t); + LOG.atDebug().setCause(t).log("{} reservedThread {} failure", ReservedThreadExecutor.this, this); } finally { diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedInvoker.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedInvoker.java index aa680279d345..9fd34c252169 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedInvoker.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedInvoker.java @@ -276,7 +276,7 @@ public void run() catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Failed while running {} of {}", link, SerializedInvoker.this, t); + LOG.atDebug().setCause(t).log("Failed while running {} of {}", link, SerializedInvoker.this); onError(task, t); } finally diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java index 53cfd24c4c74..8ec814f50042 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java @@ -279,7 +279,7 @@ public void execute(Runnable task) { // Likely stopping this component, exit. if (LOG.isDebugEnabled()) - LOG.debug("interrupted while waiting for permit {}", task, x); + LOG.atDebug().setCause(x).log("interrupted while waiting for permit {}", task); } finally { diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionStack.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionStack.java index 4a3afba73ad3..da25f82ef244 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionStack.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionStack.java @@ -65,7 +65,7 @@ public void close() catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Extension Error During Close", t); + LOG.atDebug().setCause(t).log("Extension Error During Close"); } } } diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketCoreSession.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketCoreSession.java index 8091c2768136..514814596f63 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketCoreSession.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketCoreSession.java @@ -285,7 +285,7 @@ private void closeConnection(CloseStatus closeStatus, Callback callback) public void processConnectionError(Throwable cause, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("processConnectionError {}", this, cause); + LOG.atDebug().setCause(cause).log("processConnectionError {}", this); int code; if (cause instanceof CloseException) @@ -310,7 +310,7 @@ else if (cause instanceof WebSocketTimeoutException || cause instanceof TimeoutE public void processHandlerError(Throwable cause, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("processHandlerError {}", this, cause); + LOG.atDebug().setCause(cause).log("processHandlerError {}", this); int code; if (cause instanceof CloseException) @@ -370,7 +370,7 @@ public void onOpen() x -> { if (LOG.isDebugEnabled()) - LOG.debug("Error during OPEN", x); + LOG.atDebug().setCause(x).log("Error during OPEN"); processHandlerError(new CloseException(CloseStatus.SERVER_ERROR, x), NOOP); }); diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java index ec51127f3866..7036fc771aef 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java @@ -455,7 +455,7 @@ protected void notifyCallbackSuccess(Callback callback) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while notifying success of callback {}", callback, x); + LOG.atDebug().setCause(x).log("Exception while notifying success of callback {}", callback); } } @@ -471,7 +471,7 @@ protected void notifyCallbackFailure(Callback callback, Throwable failure) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Exception while notifying failure of callback {}", callback, x); + LOG.atDebug().setCause(x).log("Exception while notifying failure of callback {}", callback); } } diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java index 5fe197b94851..3aeca1a433e2 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java @@ -155,7 +155,7 @@ public void onFrame(Frame frame, Callback callback) public void onError(Throwable cause, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("onError ", cause); + LOG.atDebug().setCause(cause).log("onError "); callback.succeeded(); } diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java index 7626f40a5960..8971e532166e 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java @@ -233,7 +233,7 @@ else if (payloadLength == 0) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("{} Parse Error {}", this, BufferUtil.toDetailString(buffer), t); + LOG.atDebug().setCause(t).log("{} Parse Error {}", this, BufferUtil.toDetailString(buffer)); buffer.position(buffer.limit()); // consume remaining diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java index ecc7fefea714..896184702569 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java @@ -158,7 +158,7 @@ public int read(ByteBuffer buffer) throws IOException public void fail(Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("fail()", failure); + LOG.atDebug().setCause(failure).log("fail()"); ArrayList entries = new ArrayList<>(); try (AutoLock.WithCondition l = lock.lock()) diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java index d4f1ef133da9..8a4bd54e0af5 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java @@ -87,7 +87,7 @@ public void onClosed(CloseStatus closeStatus) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("onError ", cause); + LOG.atDebug().setCause(cause).log("onError "); failure = cause; error.countDown(); } diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java index d2d1550c60d2..752665f726cb 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java @@ -578,7 +578,7 @@ public void onClosed(CloseStatus closeStatus, Callback callback) @Override public void onError(Throwable cause, Callback callback) { - LOG.debug("onError", cause); + LOG.atDebug().setCause(cause).log("onError"); error = cause; state = coreSession.toString(); callback.succeeded(); diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java index 085c80732b70..13934ea666d1 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java @@ -144,7 +144,7 @@ private void onOpenSuccess(Callback callback) private void onOpenFail(Callback callback, Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("[{}] onOpenFail", this, t); + LOG.atDebug().setCause(t).log("[{}] onOpenFail", this); Throwable failure = t; try (AutoLock ignored = lock.lock()) @@ -240,7 +240,7 @@ public void onFrame(Frame frame, Callback callback) public void onError(Throwable failure, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("[{}] onError", this, failure); + LOG.atDebug().setCause(failure).log("[{}] onError", this); boolean failServer2Proxy; try (AutoLock ignored = lock.lock()) @@ -269,7 +269,7 @@ public void onError(Throwable failure, Callback callback) public void fail(Throwable failure, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("[{}] fail", this, failure); + LOG.atDebug().setCause(failure).log("[{}] fail", this); Callback sendCallback = null; try (AutoLock ignored = lock.lock()) @@ -478,7 +478,7 @@ private void onConnectSuccess(CoreSession coreSession, Callback callback) private void onConnectFailure(Throwable t, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("[{}] onConnectFailure", this, t); + LOG.atDebug().setCause(t).log("[{}] onConnectFailure", this); Throwable failure = t; try (AutoLock ignored = lock.lock()) @@ -605,7 +605,7 @@ public void onFrame(Frame frame, Callback callback) public void onError(Throwable failure, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("[{}] onError", this, failure); + LOG.atDebug().setCause(failure).log("[{}] onError", this); boolean failClient2Proxy = false; try (AutoLock ignored = lock.lock()) @@ -660,7 +660,7 @@ public void onClosed(CloseStatus closeStatus, Callback callback) public void fail(Throwable failure, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug("[{}] fail", this, failure); + LOG.atDebug().setCause(failure).log("[{}] fail", this); Callback sendCallback = null; try (AutoLock ignored = lock.lock()) diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java index 20f75901b819..11a1d3350bb2 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java @@ -180,7 +180,7 @@ public void notifySessionListeners(Consumer consumer) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Failure while invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Failure while invoking listener {}", listener); } } } @@ -374,7 +374,7 @@ private org.eclipse.jetty.websocket.core.server.WebSocketCreator newWebSocketCre catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not create WebSocket endpoint", x); + LOG.atDebug().setCause(x).log("Could not create WebSocket endpoint"); cb.failed(x); return null; } diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java index f1832d333910..a1ea20c55a9f 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java @@ -100,7 +100,7 @@ public void onWebSocketOpen(Session session) @Override public void onWebSocketError(Throwable cause) { - LOG.debug("onWebSocketError", cause); + LOG.atDebug().setCause(cause).log("onWebSocketError"); assertThat("Unique Error Event", error.compareAndSet(null, cause), is(true)); errorLatch.countDown(); } diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java index bb28ed21f6ab..1b93d5063328 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java @@ -98,7 +98,7 @@ public void onPongMessage(ByteBuffer payload) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onError()", this, cause); + LOG.atDebug().setCause(cause).log("{} onError()", this); error = cause; errorLatch.countDown(); } diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java index 81f32310f71f..3ba0357e7c63 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java @@ -157,7 +157,7 @@ public void onWebSocketText(String message) public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("ServerEndpoint error", cause); + LOG.atDebug().setCause(cause).log("ServerEndpoint error"); } } } diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java index df75025e60bf..d4cb10bcddf5 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java @@ -453,7 +453,7 @@ else if (message.equals("block")) } catch (Throwable t) { - LOG.debug("send text failure", t); + LOG.atDebug().setCause(t).log("send text failure"); throw new RuntimeException(t); } } @@ -462,7 +462,7 @@ else if (message.equals("block")) public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("onWebSocketError(): ", cause); + LOG.atDebug().setCause(cause).log("onWebSocketError(): "); } @Override @@ -482,7 +482,7 @@ public void onWebSocketFrame(Frame frame, Callback callback) } catch (Throwable x) { - LOG.debug("OOPS", x); + LOG.atDebug().setCause(x).log("OOPS"); } } else if (reason.equals("abort")) diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java index fd59539f71cc..c575f781fd87 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java @@ -152,7 +152,7 @@ public void onWebSocketPong(ByteBuffer payload) public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onWebSocketError()", getClass().getSimpleName(), cause); + LOG.atDebug().setCause(cause).log("{} onWebSocketError()", getClass().getSimpleName()); proxyToServer.fail(cause); } @@ -247,7 +247,7 @@ public void onWebSocketPong(ByteBuffer payload) public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onWebSocketError()", getClass().getSimpleName(), cause); + LOG.atDebug().setCause(cause).log("{} onWebSocketError()", getClass().getSimpleName()); clientToProxy.fail(cause); } diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java index 533ac05695f9..ec96bc0dcc2d 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java @@ -395,7 +395,7 @@ public void onClose(int statusCode, String reason) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onError(): {}", this, cause); + LOG.atDebug().setCause(cause).log("{} onError(): {}", this); error = cause; errorLatch.countDown(); } diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureCallback.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureCallback.java index 27fbe4f5cdee..8570feaf54d0 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureCallback.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureCallback.java @@ -30,7 +30,7 @@ public class FutureCallback extends org.eclipse.jetty.util.FutureCallback implem public void fail(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug(".writeFailed", cause); + LOG.atDebug().setCause(cause).log(".writeFailed"); failed(cause); } diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpInput.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpInput.java index 39c2fa1371f4..696ad15e0dc7 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpInput.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpInput.java @@ -373,7 +373,7 @@ else if (chunk.isLast() && !chunk.hasRemaining()) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("running failed onAllDataRead {}", this, x); + LOG.atDebug().setCause(x).log("running failed onAllDataRead {}", this); _readListener.onError(x); } } @@ -388,7 +388,7 @@ else if (chunk.isLast() && !chunk.hasRemaining()) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("running failed onDataAvailable {}", this, x); + LOG.atDebug().setCause(x).log("running failed onDataAvailable {}", this); _readListener.onError(x); } } diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpOutput.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpOutput.java index f1b4e1ba6381..0a9957a70c19 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpOutput.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpOutput.java @@ -303,8 +303,8 @@ else if (_state == State.CLOSE) } if (LOG.isDebugEnabled()) - LOG.debug("onWriteComplete({},{}) {}->{} c={} cb={} w={}", - last, failure, state, lockedStateString(), BufferUtil.toDetailString(closeContent), closedCallback, wake, failure); + LOG.atDebug().setCause(failure).log("onWriteComplete({},{}) {}->{} c={} cb={} w={}", + last, failure, state, lockedStateString(), BufferUtil.toDetailString(closeContent), closedCallback, wake); } try @@ -1451,7 +1451,7 @@ public void writeCallback() if (LOG.isDebugEnabled()) { t.addSuppressed(error); - LOG.debug("Failed in call onError on {}", _writeListener, t); + LOG.atDebug().setCause(t).log("Failed in call onError on {}", _writeListener); } } finally diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java index b2e5fe944896..1801259ed774 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java @@ -804,7 +804,7 @@ protected void writeHttpError(Request coreRequest, Response coreResponse, Callba protected void writeHttpError(Request coreRequest, Response coreResponse, Callback callback, Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("writeHttpError(coreRequest={}, coreResponse={}, callback={}, cause={})", coreRequest, coreResponse, callback, cause, cause); + LOG.atDebug().setCause(cause).log("writeHttpError(coreRequest={}, coreResponse={}, callback={}, cause={})", coreRequest, coreResponse, callback, cause); int statusCode = HttpStatus.INTERNAL_SERVER_ERROR_500; String reason = null; @@ -820,7 +820,7 @@ protected void writeHttpError(Request coreRequest, Response coreResponse, Callba protected void writeHttpError(Request coreRequest, Response coreResponse, Callback callback, int statusCode, String reason, Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("writeHttpError(coreRequest={}, coreResponse={}, callback={}, statusCode={}, reason={}, cause={})", coreRequest, coreResponse, callback, statusCode, reason, cause, cause); + LOG.atDebug().setCause(cause).log("writeHttpError(coreRequest={}, coreResponse={}, callback={}, statusCode={}, reason={}, cause={})", coreRequest, coreResponse, callback, statusCode, reason, cause); HttpServletRequest request = getServletRequest(coreRequest); HttpServletResponse response = getServletResponse(coreResponse); try @@ -993,7 +993,7 @@ public void failed(Throwable x) try { if (LOG.isDebugEnabled()) - LOG.debug("AsyncContextCallback failed {}", _asyncContext, x); + LOG.atDebug().setCause(x).log("AsyncContextCallback failed {}", _asyncContext); // It is known that this callback is only failed if the response is already committed, // thus we can only abort the response here. _response.sendError(-1); @@ -1007,7 +1007,7 @@ public void failed(Throwable x) _asyncContext.complete(); } if (LOG.isDebugEnabled()) - LOG.debug("Async get failed", x); + LOG.atDebug().setCause(x).log("Async get failed"); } } } diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java index f0089c8abcf7..457aa620bd4e 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java @@ -731,7 +731,7 @@ else if (getCharacterEncoding() != null) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("getParts", t); + LOG.atDebug().setCause(t).log("getParts"); Throwable cause; if (t instanceof ExecutionException ee) diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java index 511897063281..b67d7688350f 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java @@ -517,7 +517,7 @@ public void handle() else ExceptionUtil.addSuppressedIfNotAssociated(cause, x); if (LOG.isDebugEnabled()) - LOG.debug("Could not perform error handling, aborting", cause); + LOG.atDebug().setCause(cause).log("Could not perform error handling, aborting"); try { @@ -694,7 +694,7 @@ protected void handleException(Throwable failure) if (quiet != null || !getServer().isRunning()) { if (LOG.isDebugEnabled()) - LOG.debug(_servletContextRequest.getServletApiRequest().getRequestURI(), failure); + LOG.atDebug().setCause(failure).log(_servletContextRequest.getServletApiRequest().getRequestURI()); } else if (noStack != null) { diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannelState.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannelState.java index faf2c34f0d2a..f455ec7c991d 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannelState.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannelState.java @@ -398,7 +398,7 @@ public void abort(Throwable failure) { boolean aborted = abortResponse(failure); if (LOG.isDebugEnabled()) - LOG.debug("abort={} {}", aborted, this, failure); + LOG.atDebug().setCause(failure).log("abort={} {}", aborted, this); if (aborted) { handle = _state == State.WAITING; @@ -664,7 +664,7 @@ void errorHandlingComplete(Throwable failure) try (AutoLock ignored = lock()) { if (LOG.isDebugEnabled()) - LOG.debug("errorHandlingComplete {}", toStringLocked(), failure); + LOG.atDebug().setCause(failure).log("errorHandlingComplete {}", toStringLocked()); handle = _state == State.WAITING; if (handle) @@ -864,7 +864,7 @@ public void asyncError(Throwable failure) try (AutoLock ignored = lock()) { if (LOG.isDebugEnabled()) - LOG.debug("asyncError {}", toStringLocked(), failure); + LOG.atDebug().setCause(failure).log("asyncError {}", toStringLocked()); if (_state == State.WAITING && _requestState == RequestState.ASYNC) { @@ -877,7 +877,7 @@ public void asyncError(Throwable failure) if (!QuietException.isQuiet(failure)) LOG.warn(failure.toString()); if (LOG.isDebugEnabled()) - LOG.debug("Async error", failure); + LOG.atDebug().setCause(failure).log("Async error"); } } diff --git a/jetty-ee10/jetty-ee10-servlets/src/main/java/org/eclipse/jetty/ee10/servlets/QoSFilter.java b/jetty-ee10/jetty-ee10-servlets/src/main/java/org/eclipse/jetty/ee10/servlets/QoSFilter.java index 716ab1641752..a95e1dc3d10b 100644 --- a/jetty-ee10/jetty-ee10-servlets/src/main/java/org/eclipse/jetty/ee10/servlets/QoSFilter.java +++ b/jetty-ee10/jetty-ee10-servlets/src/main/java/org/eclipse/jetty/ee10/servlets/QoSFilter.java @@ -234,7 +234,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha catch (IllegalStateException x) { if (LOG.isDebugEnabled()) - LOG.debug("dispatch failed", x); + LOG.atDebug().setCause(x).log("dispatch failed"); } } } diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/server/internal/JakartaWebSocketCreator.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/server/internal/JakartaWebSocketCreator.java index 994ec93a9162..2c83c0aa950a 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/server/internal/JakartaWebSocketCreator.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/server/internal/JakartaWebSocketCreator.java @@ -167,7 +167,7 @@ public Map getUserProperties() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to create websocket: {}", config.getEndpointClass().getName(), x); + LOG.atDebug().setCause(x).log("Unable to create websocket: {}", config.getEndpointClass().getName()); callback.failed(x); return null; } diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/EventSocket.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/EventSocket.java index b91a1d654fbe..a4740c77acd6 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/EventSocket.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/EventSocket.java @@ -88,7 +88,7 @@ public void onClose(CloseReason reason) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onError()", this, cause); + LOG.atDebug().setCause(cause).log("{} onError()", this); error = cause; errorLatch.countDown(); } diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/framehandlers/FrameEcho.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/framehandlers/FrameEcho.java index 4618a7bb994c..84fda300ed19 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/framehandlers/FrameEcho.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/framehandlers/FrameEcho.java @@ -48,7 +48,7 @@ public void onFrame(Frame frame, Callback callback) public void onError(Throwable cause, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug(this + " onError ", cause); + LOG.atDebug().setCause(cause).log(this + " onError "); callback.succeeded(); } diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java index f40c49749bf4..5e5befe39be9 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java @@ -60,7 +60,7 @@ public void onBinary(ByteBuffer message) throws IOException public void onError(Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("onError()", t); + LOG.atDebug().setCause(t).log("onError()"); } @OnClose diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java index f309f3779444..33bac8dbc670 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java @@ -81,7 +81,7 @@ public void onClose(CloseReason closeReason) @OnError public void onError(Throwable cause) { - LOG.debug("ClientSocket error", cause); + LOG.atDebug().setCause(cause).log("ClientSocket error"); } } diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee10/websocket/server/JettyWebSocketServerContainer.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee10/websocket/server/JettyWebSocketServerContainer.java index 0ae85259f88e..35b7e1668353 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee10/websocket/server/JettyWebSocketServerContainer.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee10/websocket/server/JettyWebSocketServerContainer.java @@ -161,7 +161,7 @@ public void addMapping(String pathSpec, JettyWebSocketCreator creator) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Could not create WebSocket endpoint", t); + LOG.atDebug().setCause(t).log("Could not create WebSocket endpoint"); cb.failed(t); return null; } @@ -214,7 +214,7 @@ public boolean upgrade(JettyWebSocketCreator creator, HttpServletRequest request catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Could not create WebSocket endpoint", t); + LOG.atDebug().setCause(t).log("Could not create WebSocket endpoint"); cb.failed(t); return null; } diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/EventSocket.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/EventSocket.java index d774856b7e7f..70b139fbc242 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/EventSocket.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/EventSocket.java @@ -89,7 +89,7 @@ public void onClose(int statusCode, String reason) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onError()", this, cause); + LOG.atDebug().setCause(cause).log("{} onError()", this); error = cause; errorLatch.countDown(); } diff --git a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpInput.java b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpInput.java index aa3dce4d780b..5af4100caf2e 100644 --- a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpInput.java +++ b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpInput.java @@ -373,7 +373,7 @@ else if (chunk.isLast() && !chunk.hasRemaining()) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("running failed onAllDataRead {}", this, x); + LOG.atDebug().setCause(x).log("running failed onAllDataRead {}", this); _readListener.onError(x); } } @@ -388,7 +388,7 @@ else if (chunk.isLast() && !chunk.hasRemaining()) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("running failed onDataAvailable {}", this, x); + LOG.atDebug().setCause(x).log("running failed onDataAvailable {}", this); _readListener.onError(x); } } diff --git a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpOutput.java b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpOutput.java index f68a7a318aba..7d6e905fee8b 100644 --- a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpOutput.java +++ b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpOutput.java @@ -296,8 +296,10 @@ else if (_state == State.CLOSE) } if (LOG.isDebugEnabled()) - LOG.debug("onWriteComplete({},{}) {}->{} c={} cb={} w={}", - last, failure, state, lockedStateString(), BufferUtil.toDetailString(closeContent), closedCallback, wake, failure); + LOG.atDebug() + .setCause(failure) + .log("onWriteComplete({}) {}->{} c={} cb={} w={}", + last, state, lockedStateString(), BufferUtil.toDetailString(closeContent), closedCallback, wake); } try @@ -1438,7 +1440,7 @@ public void writeCallback() if (LOG.isDebugEnabled()) { t.addSuppressed(error); - LOG.debug("Failed in call onError on {}", _writeListener, t); + LOG.atDebug().setCause(t).log("Failed in call onError on {}", _writeListener); } } finally diff --git a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ResourceServlet.java b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ResourceServlet.java index 26eb82f837ec..98bb56efb02a 100644 --- a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ResourceServlet.java +++ b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ResourceServlet.java @@ -816,7 +816,7 @@ protected void writeHttpError(Request coreRequest, Response coreResponse, Callba protected void writeHttpError(Request coreRequest, Response coreResponse, Callback callback, Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("writeHttpError(coreRequest={}, coreResponse={}, callback={}, cause={})", coreRequest, coreResponse, callback, cause, cause); + LOG.atDebug().setCause(cause).log("writeHttpError(coreRequest={}, coreResponse={}, callback={}, cause={})", coreRequest, coreResponse, callback, cause); int statusCode = HttpStatus.INTERNAL_SERVER_ERROR_500; String reason = null; @@ -832,7 +832,7 @@ protected void writeHttpError(Request coreRequest, Response coreResponse, Callba protected void writeHttpError(Request coreRequest, Response coreResponse, Callback callback, int statusCode, String reason, Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("writeHttpError(coreRequest={}, coreResponse={}, callback={}, statusCode={}, reason={}, cause={})", coreRequest, coreResponse, callback, statusCode, reason, cause, cause); + LOG.atDebug().setCause(cause).log("writeHttpError(coreRequest={}, coreResponse={}, callback={}, statusCode={}, reason={}, cause={})", coreRequest, coreResponse, callback, statusCode, reason, cause); HttpServletRequest request = getServletRequest(coreRequest); HttpServletResponse response = getServletResponse(coreResponse); try @@ -1005,7 +1005,7 @@ public void failed(Throwable x) try { if (LOG.isDebugEnabled()) - LOG.debug("AsyncContextCallback failed {}", _asyncContext, x); + LOG.atDebug().setCause(x).log("AsyncContextCallback failed {}", _asyncContext); // It is known that this callback is only failed if the response is already committed, // thus we can only abort the response here. _response.sendError(-1); @@ -1019,7 +1019,7 @@ public void failed(Throwable x) _asyncContext.complete(); } if (LOG.isDebugEnabled()) - LOG.debug("Async get failed", x); + LOG.atDebug().setCause(x).log("Async get failed"); } } } diff --git a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java index cda6652d5dee..0cc572f5ba2b 100644 --- a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java +++ b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java @@ -722,7 +722,7 @@ else if (getCharacterEncoding() != null) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("getParts", t); + LOG.atDebug().setCause(t).log("getParts"); Throwable cause; if (t instanceof ExecutionException ee) diff --git a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannel.java b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannel.java index 5c67d62bd178..c21d0bfba57c 100644 --- a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannel.java +++ b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannel.java @@ -518,7 +518,7 @@ public void handle() else ExceptionUtil.addSuppressedIfNotAssociated(cause, x); if (LOG.isDebugEnabled()) - LOG.debug("Could not perform error handling, aborting", cause); + LOG.atDebug().setCause(cause).log("Could not perform error handling, aborting"); try { @@ -695,7 +695,7 @@ protected void handleException(Throwable failure) if (quiet != null || !getServer().isRunning()) { if (LOG.isDebugEnabled()) - LOG.debug(_servletContextRequest.getServletApiRequest().getRequestURI(), failure); + LOG.atDebug().setCause(failure).log(_servletContextRequest.getServletApiRequest().getRequestURI()); } else if (noStack != null) { diff --git a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannelState.java b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannelState.java index 9af367ee4a61..ea3859296e72 100644 --- a/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannelState.java +++ b/jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannelState.java @@ -397,7 +397,7 @@ public void abort(Throwable failure) { boolean aborted = abortResponse(failure); if (LOG.isDebugEnabled()) - LOG.debug("abort={} {}", aborted, this, failure); + LOG.atDebug().setCause(failure).log("abort={} {}", aborted, this); if (aborted) { handle = _state == State.WAITING; @@ -663,7 +663,7 @@ void errorHandlingComplete(Throwable failure) try (AutoLock ignored = lock()) { if (LOG.isDebugEnabled()) - LOG.debug("errorHandlingComplete {}", toStringLocked(), failure); + LOG.atDebug().setCause(failure).log("errorHandlingComplete {}", toStringLocked()); handle = _state == State.WAITING; if (handle) @@ -863,7 +863,7 @@ public void asyncError(Throwable failure) try (AutoLock ignored = lock()) { if (LOG.isDebugEnabled()) - LOG.debug("asyncError {}", toStringLocked(), failure); + LOG.atDebug().setCause(failure).log("asyncError {}", toStringLocked()); if (_state == State.WAITING && _requestState == RequestState.ASYNC) { @@ -876,7 +876,7 @@ public void asyncError(Throwable failure) if (!QuietException.isQuiet(failure)) LOG.warn(failure.toString()); if (LOG.isDebugEnabled()) - LOG.debug("Async error", failure); + LOG.atDebug().setCause(failure).log("Async error"); } } diff --git a/jetty-ee11/jetty-ee11-servlets/src/main/java/org/eclipse/jetty/ee11/servlets/QoSFilter.java b/jetty-ee11/jetty-ee11-servlets/src/main/java/org/eclipse/jetty/ee11/servlets/QoSFilter.java index 28abf2d325d0..9bc56061f813 100644 --- a/jetty-ee11/jetty-ee11-servlets/src/main/java/org/eclipse/jetty/ee11/servlets/QoSFilter.java +++ b/jetty-ee11/jetty-ee11-servlets/src/main/java/org/eclipse/jetty/ee11/servlets/QoSFilter.java @@ -234,7 +234,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha catch (IllegalStateException x) { if (LOG.isDebugEnabled()) - LOG.debug("dispatch failed", x); + LOG.atDebug().setCause(x).log("dispatch failed"); } } } diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/server/internal/JakartaWebSocketCreator.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/server/internal/JakartaWebSocketCreator.java index d23262f40c5e..b24ab5e8f4ca 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/server/internal/JakartaWebSocketCreator.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/server/internal/JakartaWebSocketCreator.java @@ -169,7 +169,7 @@ public Map getUserProperties() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to create websocket: {}", config.getEndpointClass().getName(), x); + LOG.atDebug().setCause(x).log("Unable to create websocket: {}", config.getEndpointClass().getName()); callback.failed(x); return null; } diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/EventSocket.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/EventSocket.java index 13d70f0c4c72..76f1283da873 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/EventSocket.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/EventSocket.java @@ -88,7 +88,7 @@ public void onClose(CloseReason reason) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onError()", this, cause); + LOG.atDebug().setCause(cause).log("{} onError()", this); error = cause; errorLatch.countDown(); } diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/framehandlers/FrameEcho.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/framehandlers/FrameEcho.java index 885bf5c6e265..695031a2d715 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/framehandlers/FrameEcho.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/framehandlers/FrameEcho.java @@ -48,7 +48,7 @@ public void onFrame(Frame frame, Callback callback) public void onError(Throwable cause, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug(this + " onError ", cause); + LOG.atDebug().setCause(cause).log(this + " onError "); callback.succeeded(); } diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java index 8b4fdb0473bc..308c93da4789 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java @@ -60,7 +60,7 @@ public void onBinary(ByteBuffer message) throws IOException public void onError(Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("onError()", t); + LOG.atDebug().setCause(t).log("onError()"); } @OnClose diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java index 6eb1e140aa6d..66dcbcb490fd 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java @@ -81,7 +81,7 @@ public void onClose(CloseReason closeReason) @OnError public void onError(Throwable cause) { - LOG.debug("ClientSocket error", cause); + LOG.atDebug().setCause(cause).log("ClientSocket error"); } } diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee11/websocket/server/JettyWebSocketServerContainer.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee11/websocket/server/JettyWebSocketServerContainer.java index 145092a32838..6a25eeddbc30 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee11/websocket/server/JettyWebSocketServerContainer.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee11/websocket/server/JettyWebSocketServerContainer.java @@ -161,7 +161,7 @@ public void addMapping(String pathSpec, JettyWebSocketCreator creator) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Could not create WebSocket endpoint", t); + LOG.atDebug().setCause(t).log("Could not create WebSocket endpoint"); cb.failed(t); return null; } @@ -214,7 +214,7 @@ public boolean upgrade(JettyWebSocketCreator creator, HttpServletRequest request catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Could not create WebSocket endpoint", t); + LOG.atDebug().setCause(t).log("Could not create WebSocket endpoint"); cb.failed(t); return null; } diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee11/websocket/tests/EventSocket.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee11/websocket/tests/EventSocket.java index e7ea27cbb092..86d8ebf77d83 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee11/websocket/tests/EventSocket.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee11/websocket/tests/EventSocket.java @@ -89,7 +89,7 @@ public void onClose(int statusCode, String reason) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onError()", this, cause); + LOG.atDebug().setCause(cause).log("{} onError()", this); error = cause; errorLatch.countDown(); } diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/AsyncContentProducer.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/AsyncContentProducer.java index c5c10781ac3e..461762deae14 100644 --- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/AsyncContentProducer.java +++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/AsyncContentProducer.java @@ -452,7 +452,7 @@ private HttpInput.Content intercept() // when the special content was caused by the interceptor throwing. _error = true; if (LOG.isDebugEnabled()) - LOG.debug("interceptor threw exception {}", this, x); + LOG.atDebug().setCause(x).log("interceptor threw exception {}", this); return _transformedContent; } } diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/FileBufferedResponseHandler.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/FileBufferedResponseHandler.java index 4531ad859e23..ec05ecaf9293 100644 --- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/FileBufferedResponseHandler.java +++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/FileBufferedResponseHandler.java @@ -125,7 +125,7 @@ protected void dispose() catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Could not immediately delete file (delaying to jvm exit) {}", _filePath, t); + LOG.atDebug().setCause(t).log("Could not immediately delete file (delaying to jvm exit) {}", _filePath); _filePath.toFile().deleteOnExit(); } _filePath = null; diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannel.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannel.java index 1b036ec0d0ab..c8d0ab7b6ce6 100644 --- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannel.java +++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannel.java @@ -568,7 +568,7 @@ public boolean handle() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not perform ERROR dispatch, aborting", x); + LOG.atDebug().setCause(x).log("Could not perform ERROR dispatch, aborting"); abort(x); } finally @@ -762,7 +762,7 @@ protected void handleException(Throwable failure) if (quiet != null || !getServer().isRunning()) { if (LOG.isDebugEnabled()) - LOG.debug(_request.getRequestURI(), failure); + LOG.atDebug().setCause(failure).log(_request.getRequestURI()); } else if (noStack != null) { @@ -1061,7 +1061,7 @@ public boolean sendResponse(MetaData.Response info, ByteBuffer content, boolean catch (Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to send response", failure); + LOG.atDebug().setCause(failure).log("Unable to send response"); abort(failure); throw failure; } @@ -1183,7 +1183,7 @@ private void notifyEvent1(Function> function, Reques catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Failure invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Failure invoking listener {}", listener); } } } @@ -1200,7 +1200,7 @@ private void notifyEvent2(Function> fu catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Failure invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Failure invoking listener {}", listener); } } } @@ -1216,7 +1216,7 @@ private void notifyEvent2(Function> fun catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Failure invoking listener {}", listener, x); + LOG.atDebug().setCause(x).log("Failure invoking listener {}", listener); } } } @@ -1429,7 +1429,7 @@ public void succeeded() public void failed(final Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Commit failed", x); + LOG.atDebug().setCause(x).log("Commit failed"); if (x instanceof HttpException httpException) { diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannelState.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannelState.java index 5884eaffd56d..dc47faa5aa14 100644 --- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannelState.java +++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannelState.java @@ -360,7 +360,7 @@ Boolean abort(Throwable failure) { boolean aborted = abortResponse(failure); if (LOG.isDebugEnabled()) - LOG.debug("abort={} {}", aborted, this, failure); + LOG.atDebug().setCause(failure).log("abort={} {}", aborted, this); if (aborted) { handle = _state == State.WAITING; @@ -700,7 +700,7 @@ public void run() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("{} while invoking onTimeout listener {}", x.toString(), listener, x); + LOG.atDebug().setCause(x).log("{} while invoking onTimeout listener {}", x.toString(), listener); else LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener); } @@ -778,7 +778,7 @@ public void asyncError(Throwable failure) try (AutoLock l = lock()) { if (LOG.isDebugEnabled()) - LOG.debug("asyncError {}", toStringLocked(), failure); + LOG.atDebug().setCause(failure).log("asyncError {}", toStringLocked()); if (_state == State.WAITING && _requestState == RequestState.ASYNC) { @@ -791,7 +791,7 @@ public void asyncError(Throwable failure) if (!(failure instanceof QuietException)) LOG.warn(failure.toString()); if (LOG.isDebugEnabled()) - LOG.debug("Async error", failure); + LOG.atDebug().setCause(failure).log("Async error"); } } @@ -866,7 +866,7 @@ protected boolean onError(Throwable th) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("{} while invoking onError listener {}", x, listener, x); + LOG.atDebug().setCause(x).log("{} while invoking onError listener {}", x, listener); else LOG.warn("{} while invoking onError listener {}", x, listener); } diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpInput.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpInput.java index 279cb5ab54c0..534a417b49de 100644 --- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpInput.java +++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpInput.java @@ -431,7 +431,7 @@ else if (content.isEof()) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("running failed onAllDataRead {}", this, x); + LOG.atDebug().setCause(x).log("running failed onAllDataRead {}", this); _readListener.onError(x); } } @@ -447,7 +447,7 @@ else if (content.isEof()) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("running failed onDataAvailable {}", this, x); + LOG.atDebug().setCause(x).log("running failed onDataAvailable {}", this); _readListener.onError(x); } } diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java index 9ce28caa2f80..e9be61b7fd7c 100644 --- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java +++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java @@ -328,8 +328,8 @@ else if (_state == State.CLOSE) } if (LOG.isDebugEnabled()) - LOG.debug("onWriteComplete({},{}) {}->{} c={} cb={} w={}", - last, failure, state, stateString(), BufferUtil.toDetailString(closeContent), closedCallback, wake, failure); + LOG.atDebug().setCause(failure).log("onWriteComplete({},{}) {}->{} c={} cb={} w={}", + last, failure, state, stateString(), BufferUtil.toDetailString(closeContent), closedCallback, wake); try { @@ -1350,7 +1350,7 @@ public void failed(Throwable x) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to send resource {}", resource, x); + LOG.atDebug().setCause(x).log("Unable to send resource {}", resource); callback.failed(x); } } @@ -1395,7 +1395,7 @@ public void failed(Throwable x) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to send http content {}", httpContent, x); + LOG.atDebug().setCause(x).log("Unable to send http content {}", httpContent); _channel.abort(x); callback.failed(x); } @@ -1573,7 +1573,7 @@ public void run() if (LOG.isDebugEnabled()) { t.addSuppressed(error); - LOG.debug("Failed in call onError on {}", _writeListener, t); + LOG.atDebug().setCause(t).log("Failed in call onError on {}", _writeListener); } } finally diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java index 848f2e12a2fd..9c4766d7f1e5 100644 --- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java +++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java @@ -850,7 +850,7 @@ private Cookie convertCookie(HttpCookie cookie) catch (Exception x) { if (LOG.isDebugEnabled()) - LOG.debug("Bad Cookie", x); + LOG.atDebug().setCause(x).log("Bad Cookie"); } return null; } diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceService.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceService.java index 8d6bdb3dfc75..b78590f6e8dd 100644 --- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceService.java +++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceService.java @@ -746,7 +746,7 @@ public void failed(Throwable x) { String msg = "Failed to send content"; if (x instanceof IOException) - LOG.debug(msg, x); + LOG.atDebug().setCause(x).log(msg); else LOG.warn(msg, x); context.complete(); diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ErrorPageErrorHandler.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ErrorPageErrorHandler.java index 077a3c0e1de8..93c18b0a316e 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ErrorPageErrorHandler.java +++ b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ErrorPageErrorHandler.java @@ -157,7 +157,7 @@ public String getErrorPage(HttpServletRequest request) Throwable originalThrowable = (Throwable)request.getAttribute(Dispatcher.ERROR_EXCEPTION); dbg.append(originalThrowable.getClass().getName()); dbg.append(')'); - LOG.debug(dbg.toString(), cause); + LOG.atDebug().setCause(cause).log(dbg.toString()); break; case STATUS_CODE: dbg.append(" (from status code "); diff --git a/jetty-ee9/jetty-ee9-servlets/src/main/java/org/eclipse/jetty/ee9/servlets/QoSFilter.java b/jetty-ee9/jetty-ee9-servlets/src/main/java/org/eclipse/jetty/ee9/servlets/QoSFilter.java index bfb011235ea9..5fd3548391b2 100644 --- a/jetty-ee9/jetty-ee9-servlets/src/main/java/org/eclipse/jetty/ee9/servlets/QoSFilter.java +++ b/jetty-ee9/jetty-ee9-servlets/src/main/java/org/eclipse/jetty/ee9/servlets/QoSFilter.java @@ -234,7 +234,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha catch (IllegalStateException x) { if (LOG.isDebugEnabled()) - LOG.debug("dispatch failed", x); + LOG.atDebug().setCause(x).log("dispatch failed"); } } } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/server/internal/JakartaWebSocketCreator.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/server/internal/JakartaWebSocketCreator.java index 1bde01dcbc95..06eb39e9af13 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/server/internal/JakartaWebSocketCreator.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/server/internal/JakartaWebSocketCreator.java @@ -167,7 +167,7 @@ public Map getUserProperties() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Unable to create WebSocket: {}", config.getEndpointClass().getName(), x); + LOG.atDebug().setCause(x).log("Unable to create WebSocket: {}", config.getEndpointClass().getName()); callback.failed(x); return null; } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/EventSocket.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/EventSocket.java index 855e6bdf6f19..5c37b930dacc 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/EventSocket.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/EventSocket.java @@ -89,7 +89,7 @@ public void onClose(CloseReason reason) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onError(): {}", toString(), cause); + LOG.atDebug().setCause(cause).log("{} onError(): {}", toString()); error = cause; errorLatch.countDown(); } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/framehandlers/FrameEcho.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/framehandlers/FrameEcho.java index a3ff7d5e45d3..099a1f00d52d 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/framehandlers/FrameEcho.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/framehandlers/FrameEcho.java @@ -54,7 +54,7 @@ public void onFrame(Frame frame, Callback callback) public void onError(Throwable cause, Callback callback) { if (LOG.isDebugEnabled()) - LOG.debug(this + " onError ", cause); + LOG.atDebug().setCause(cause).log(this + " onError "); callback.succeeded(); } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java index f3949f875d82..b39efd77e038 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java @@ -60,7 +60,7 @@ public void onBinary(ByteBuffer message) throws IOException public void onError(Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("onError()", t); + LOG.atDebug().setCause(t).log("onError()"); } @OnClose diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java index 8ba2d626bf5c..6b4fc6439e06 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/server/examples/WebSocketServerExamplesTest.java @@ -81,7 +81,7 @@ public void onClose(CloseReason closeReason) @OnError public void onError(Throwable cause) { - LOG.debug("ClientSocket error", cause); + LOG.atDebug().setCause(cause).log("ClientSocket error"); } } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java index 245fc7855641..34f3cdc7169a 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java @@ -162,7 +162,7 @@ public void addMapping(String pathSpec, JettyWebSocketCreator creator) catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Could not create WebSocket endpoint", t); + LOG.atDebug().setCause(t).log("Could not create WebSocket endpoint"); cb.failed(t); return null; } @@ -215,7 +215,7 @@ public boolean upgrade(JettyWebSocketCreator creator, HttpServletRequest request catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("Could not create WebSocket endpoint", t); + LOG.atDebug().setCause(t).log("Could not create WebSocket endpoint"); cb.failed(t); return null; } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/CloseTrackingEndpoint.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/CloseTrackingEndpoint.java index 1fa2a8deeb61..f94225956934 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/CloseTrackingEndpoint.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/CloseTrackingEndpoint.java @@ -99,7 +99,7 @@ public void onWebSocketConnect(Session session) @Override public void onWebSocketError(Throwable cause) { - LOG.debug("onWebSocketError", cause); + LOG.atDebug().setCause(cause).log("onWebSocketError"); assertThat("Unique Error Event", error.compareAndSet(null, cause), is(true)); errorLatch.countDown(); } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/EventSocket.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/EventSocket.java index d4ca3bb55771..81adaabc5098 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/EventSocket.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/EventSocket.java @@ -88,7 +88,7 @@ public void onClose(int statusCode, String reason) public void onError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onError()", this, cause); + LOG.atDebug().setCause(cause).log("{} onError()", this); error = cause; errorLatch.countDown(); } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/client/BadNetworkTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/client/BadNetworkTest.java index d91b1bd36b38..99ca4e66ef71 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/client/BadNetworkTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/client/BadNetworkTest.java @@ -185,7 +185,7 @@ public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) { - LOG.debug("ServerEndpoint error", cause); + LOG.atDebug().setCause(cause).log("ServerEndpoint error"); } } } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/client/ClientCloseTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/client/ClientCloseTest.java index d442c0dae08d..7a9831ab3f3d 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/client/ClientCloseTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/client/ClientCloseTest.java @@ -452,7 +452,7 @@ else if (message.equals("block")) } catch (Throwable t) { - LOG.debug("send text failure", t); + LOG.atDebug().setCause(t).log("send text failure"); throw new RuntimeException(t); } } @@ -472,7 +472,7 @@ public void onWebSocketConnect(Session session) public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("onWebSocketError(): ", cause); + LOG.atDebug().setCause(cause).log("onWebSocketError(): "); } @Override diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/proxy/WebSocketProxy.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/proxy/WebSocketProxy.java index 3eed8dbcdb6e..09bb4b0a1689 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/proxy/WebSocketProxy.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/proxy/WebSocketProxy.java @@ -177,7 +177,7 @@ public void onWebSocketPong(ByteBuffer payload) public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onWebSocketError()", getClass().getSimpleName(), cause); + LOG.atDebug().setCause(cause).log("{} onWebSocketError()", getClass().getSimpleName()); proxyToServer.fail(cause); } @@ -291,7 +291,7 @@ public void onWebSocketPong(ByteBuffer payload) public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug("{} onWebSocketError()", getClass().getSimpleName(), cause); + LOG.atDebug().setCause(cause).log("{} onWebSocketError()", getClass().getSimpleName()); clientToProxy.fail(cause); } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/util/FutureWriteCallback.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/util/FutureWriteCallback.java index 0e0cc12c3006..8ad66ee170cf 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/util/FutureWriteCallback.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/util/FutureWriteCallback.java @@ -31,7 +31,7 @@ public class FutureWriteCallback extends FutureCallback implements WriteCallback public void writeFailed(Throwable cause) { if (LOG.isDebugEnabled()) - LOG.debug(".writeFailed", cause); + LOG.atDebug().setCause(cause).log(".writeFailed"); failed(cause); } diff --git a/jetty-integrations/jetty-ethereum/src/main/java/org/eclipse/jetty/security/siwe/EthereumAuthenticator.java b/jetty-integrations/jetty-ethereum/src/main/java/org/eclipse/jetty/security/siwe/EthereumAuthenticator.java index 2d50121ff1f1..1dab6223ded5 100644 --- a/jetty-integrations/jetty-ethereum/src/main/java/org/eclipse/jetty/security/siwe/EthereumAuthenticator.java +++ b/jetty-integrations/jetty-ethereum/src/main/java/org/eclipse/jetty/security/siwe/EthereumAuthenticator.java @@ -498,7 +498,7 @@ protected SignedMessage parseMessage(Request request, Response response, Callbac catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("error reading SIWE message and signature", t); + LOG.atDebug().setCause(t).log("error reading SIWE message and signature"); sendError(request, response, callback, t.getMessage()); return null; } diff --git a/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/jmh/ReservedThreadExecutorExchanger.java b/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/jmh/ReservedThreadExecutorExchanger.java index 978a60f24ce3..f7ce56f5a815 100644 --- a/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/jmh/ReservedThreadExecutorExchanger.java +++ b/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/jmh/ReservedThreadExecutorExchanger.java @@ -316,14 +316,14 @@ public void run() catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("{} task {} failure", ReservedThreadExecutorExchanger.this, task, t); + LOG.atDebug().setCause(t).log("{} task {} failure", ReservedThreadExecutorExchanger.this, task); } } } catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug("{} reservedThread {} failure", ReservedThreadExecutorExchanger.this, this, t); + LOG.atDebug().setCause(t).log("{} reservedThread {} failure", ReservedThreadExecutorExchanger.this, this); } finally {