1 files changed, 24 insertions, 7 deletions

diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
index 7b723b3a48e..775c903f5f8 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
@@ -27,6 +27,8 @@ import org.eclipse.jetty.server.handler.gzip.GzipHandler;
 import org.eclipse.jetty.server.handler.gzip.GzipHttpOutputInterceptor;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.log.JavaUtilLog;
+import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 import javax.management.remote.JMXServiceURL;
@@ -68,6 +70,8 @@ public class JettyHttpServer extends AbstractServerProvider {
         if (connectorFactories.allComponents().isEmpty())
             throw new IllegalArgumentException("No connectors configured.");
 
+        initializeJettyLogging();
+
         server = new Server();
         server.setStopTimeout((long)(serverConfig.stopTimeout() * 1000.0));
         server.setRequestLog(new AccessLogRequestLog(requestLog, serverConfig.accessLog()));
@@ -92,6 +96,15 @@ public class JettyHttpServer extends AbstractServerProvider {
         this.metricsReporter = new ServerMetricReporter(metric, server);
     }
 
+    private static void initializeJettyLogging() {
+        // Note: Jetty is logging stderr if no logger is explicitly configured
+        try {
+            Log.setLog(new JavaUtilLog());
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to initialize logging framework for Jetty");
+        }
+    }
+
     private static void setupJmx(Server server, ServerConfig serverConfig) {
         if (serverConfig.jmx().enabled()) {
             System.setProperty("java.rmi.server.hostname", "localhost");
@@ -139,7 +152,7 @@ public class JettyHttpServer extends AbstractServerProvider {
         }
         StatisticsHandler root = newGenericStatisticsHandler();
         addChainToRoot(root, List.of(
-                newResponseStatisticsHandler(serverCfg), newGzipHandler(), perConnectorHandlers));
+                newResponseStatisticsHandler(serverCfg), newGzipHandler(serverCfg), perConnectorHandlers));
         return root;
     }
 
@@ -240,18 +253,22 @@ public class JettyHttpServer extends AbstractServerProvider {
         return statisticsHandler;
     }
 
-    private static GzipHandler newGzipHandler() { return new GzipHandlerWithVaryHeaderFixed(); }
+    private static GzipHandler newGzipHandler(ServerConfig serverConfig) {
+        GzipHandler gzipHandler = new GzipHandlerWithVaryHeaderFixed();
+        gzipHandler.setCompressionLevel(serverConfig.responseCompressionLevel());
+        gzipHandler.setInflateBufferSize(8 * 1024);
+        gzipHandler.setIncludedMethods("GET", "POST", "PUT", "PATCH");
+        return gzipHandler;
+    }
 
     /** A subclass which overrides Jetty's default behavior of including user-agent in the vary field */
     private static class GzipHandlerWithVaryHeaderFixed extends GzipHandler {
 
-        GzipHandlerWithVaryHeaderFixed() {
-            setInflateBufferSize(8 * 1024);
-            setIncludedMethods("GET", "POST", "PUT", "PATCH");
+        @Override
+        public HttpField getVaryField() {
+            return GzipHttpOutputInterceptor.VARY_ACCEPT_ENCODING;
         }
 
-        @Override public HttpField getVaryField() { return GzipHttpOutputInterceptor.VARY_ACCEPT_ENCODING; }
-
     }
 
 }