diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-02-20 18:20:16 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-02-20 18:20:16 +0100 |
commit | 87c5e61bdf7336e1c0a05b0af370d52bb4380811 (patch) | |
tree | 7adb16a407fc72d8aee7f8a285d7872ff99dd36d /jdisc_http_service | |
parent | a2e8fb136ad7c499a9721eed484abf684dfb3d20 (diff) |
Revert "Configure Jetty to log using java.util.logging"
This reverts commit 91a1b6ccd587820dc2bc12acf7dc30753d8cabb1.
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java index e5c9ec968db..9d0b690e767 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java @@ -15,12 +15,7 @@ import com.yahoo.jdisc.http.server.FilterBindings; import com.yahoo.jdisc.service.AbstractServerProvider; import com.yahoo.jdisc.service.CurrentContainer; import org.eclipse.jetty.http.HttpField; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.RequestLog; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnectionStatistics; -import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.*; import org.eclipse.jetty.server.handler.AbstractHandlerContainer; import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.server.handler.RequestLogHandler; @@ -30,8 +25,6 @@ import org.eclipse.jetty.server.handler.gzip.GzipHttpOutputInterceptor; import org.eclipse.jetty.servlet.FilterHolder; 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 org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; @@ -42,12 +35,7 @@ import java.net.BindException; import java.nio.channels.FileChannel; import java.nio.channels.ServerSocketChannel; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -138,8 +126,6 @@ public class JettyHttpServer extends AbstractServerProvider { throw new IllegalArgumentException("No connectors configured."); this.metric = metric; - initializeJettyLogging(); - server = new Server(); ((QueuedThreadPool)server.getThreadPool()).setMaxThreads(serverConfig.maxWorkerThreads()); @@ -187,15 +173,6 @@ public class JettyHttpServer extends AbstractServerProvider { metricReporterExecutor.scheduleAtFixedRate(new MetricTask(), 0, 2, TimeUnit.SECONDS); } - 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 HandlerCollection getHandlerCollection( ServerConfig serverConfig, ServletPathsConfig servletPathsConfig, |