diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-11 11:08:57 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-11 11:11:17 +0200 |
commit | 9c2d8b1410de1b56323667d749b1b43b66e0f840 (patch) | |
tree | 39d45bced2c4ce4a3607080daa3d8f18eb20c450 /jdisc_http_service | |
parent | a65debbc8da8e22d8a3752888bc7535fe4b275a7 (diff) |
Register access log directly on Server
The access log must be registered on the Server instance to be able to
log requests that are rejected by Jetty (e.g 414).
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java | 16 |
1 files changed, 4 insertions, 12 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 7bff685e780..d491daf55dd 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 @@ -19,13 +19,11 @@ import org.eclipse.jetty.jmx.ConnectorServer; import org.eclipse.jetty.jmx.MBeanContainer; 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.handler.AbstractHandlerContainer; import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.server.handler.gzip.GzipHandler; import org.eclipse.jetty.server.handler.gzip.GzipHttpOutputInterceptor; @@ -137,6 +135,7 @@ public class JettyHttpServer extends AbstractServerProvider { initializeJettyLogging(); server = new Server(); + server.setRequestLog(new AccessLogRequestLog(accessLog)); setupJmx(server, serverConfig); ((QueuedThreadPool)server.getThreadPool()).setMaxThreads(serverConfig.maxWorkerThreads()); @@ -159,16 +158,13 @@ public class JettyHttpServer extends AbstractServerProvider { ServletHolder jdiscServlet = new ServletHolder(new JDiscHttpServlet(jDiscContext)); FilterHolder jDiscFilterInvokerFilter = new FilterHolder(new JDiscFilterInvokerFilter(jDiscContext, filterInvoker)); - RequestLog requestLog = new AccessLogRequestLog(accessLog); - server.setHandler( getHandlerCollection( serverConfig, servletPathsConfig, jdiscServlet, servletHolders, - jDiscFilterInvokerFilter, - requestLog)); + jDiscFilterInvokerFilter)); int numMetricReporterThreads = 1; metricReporterExecutor = Executors.newScheduledThreadPool( @@ -217,8 +213,7 @@ public class JettyHttpServer extends AbstractServerProvider { ServletPathsConfig servletPathsConfig, ServletHolder jdiscServlet, ComponentRegistry<ServletHolder> servletHolders, - FilterHolder jDiscFilterInvokerFilter, - RequestLog requestLog) { + FilterHolder jDiscFilterInvokerFilter) { ServletContextHandler servletContextHandler = createServletContextHandler(); @@ -236,11 +231,8 @@ public class JettyHttpServer extends AbstractServerProvider { StatisticsHandler statisticsHandler = newStatisticsHandler(); statisticsHandler.setHandler(gzipHandler); - RequestLogHandler requestLogHandler = new RequestLogHandler(); - requestLogHandler.setRequestLog(requestLog); - HandlerCollection handlerCollection = new HandlerCollection(); - handlerCollection.setHandlers(new Handler[]{statisticsHandler, requestLogHandler}); + handlerCollection.setHandlers(new Handler[]{statisticsHandler}); return handlerCollection; } |