diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java index e66edf43887..8e7c61eecfc 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java @@ -150,7 +150,10 @@ public abstract class SslBytesTest } catch (IOException x) { - x.printStackTrace(); + logger.warn(x.getClass() + ": " + x.getMessage()); + + if(logger.isDebugEnabled()) + logger.debug(x); } } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java index 0645430f1a4..703806b8afd 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java @@ -835,7 +835,10 @@ public class SocketChannelEndPointTest } catch (InterruptedException | EofException e) { - LOG.info(e); + if(LOG.isDebugEnabled()) + LOG.debug(e); + else + LOG.info(e.getClass().getName()); } catch (Exception e) { diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java index 6343af16033..d3f81dff5ec 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java @@ -49,7 +49,11 @@ public abstract class TrackingSocket protected void addError(Throwable t) { - LOG.warn(t); + LOG.warn(t.getClass() + ": " + t.getMessage()); + + if(LOG.isDebugEnabled()) + LOG.debug(t); + errorQueue.offer(t); } diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java index 0784bc77f2b..8a8f6bae1c9 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java @@ -55,6 +55,7 @@ import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.log.StacklessLogging; +import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Assume; @@ -430,7 +431,7 @@ public class ServerTimeoutsTest extends AbstractTest }); setServerIdleTimeout(idleTimeout); - try (StacklessLogging stackless = new StacklessLogging(HttpChannel.class)) + try (StacklessLogging stackless = new StacklessLogging(HttpChannel.class, QueuedThreadPool.class)) { DeferredContentProvider contentProvider = new DeferredContentProvider(); CountDownLatch resultLatch = new CountDownLatch(1);