Skip to content

Commit 25001a1

Browse files
authored
12.0.x Remove usage of Slf4j fluent api (#14642)
* Remove usage of Slf4j fluent api Signed-off-by: Olivier Lamy <olamy@apache.org>
1 parent 2c36070 commit 25001a1

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ else if (filled == 0)
110110

111111
if (failure != null)
112112
{
113-
LOG.atDebug().setCause(failure).log("Unable to fill from endpoint");
113+
if (LOG.isDebugEnabled())
114+
LOG.debug("Unable to fill from endpoint", failure);
114115
close();
115116
failConnectionPromise(failure);
116117
}

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ private void completeChannelCallback(Throwable failure)
15851585
else if (failure != null && unconsumed != null)
15861586
ExceptionUtil.addSuppressedIfNotAssociated(failure, unconsumed);
15871587
if (LOG.isDebugEnabled())
1588-
LOG.atDebug().setCause(failure).log("consumeAvailable: {} {}", unconsumed == null, httpChannelState);
1588+
LOG.debug("consumeAvailable: {} {}", unconsumed == null, httpChannelState, failure);
15891589
}
15901590

15911591
// Pending writes are also failures

tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ public void testLog4j2ModuleWithSimpleWebAppWithJSP(String env) throws Exception
419419
{
420420
assertTrue(run1.awaitForStart());
421421
assertEquals(0, run1.getExitValue());
422-
LOG.atInfo().setMessage(run1.logs().get()).log();
422+
LOG.info(run1.logs().get());
423423
assertTrue(Files.exists(distribution.getJettyBase().resolve("resources/log4j2.xml")));
424424

425425
Path war = distribution.resolveArtifact("org.eclipse.jetty." + env + ".demos:jetty-" + env + "-demo-jsp-webapp:war:" + jettyVersion);

0 commit comments

Comments
 (0)