Merge pull request #30 from takari/access-logs

allow custom access logs
takari · Oct 30, 2019 · f5d779b · f5d779b
2 parents f26818f + d33e4dc
commit f5d779b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/ollie/src/main/java/com/walmartlabs/ollie/OllieServer.java b/ollie/src/main/java/com/walmartlabs/ollie/OllieServer.java
@@ -63,12 +63,7 @@
 import javax.servlet.SessionCookieConfig;
 import javax.servlet.http.HttpServlet;
 import org.eclipse.jetty.jmx.MBeanContainer;
-import org.eclipse.jetty.server.HttpConfiguration;
-import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.SecureRequestCustomizer;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.SslConnectionFactory;
+import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.ResourceHandler;
@@ -306,6 +301,11 @@ public Server build(OllieServerBuilder builder) {
     statisticsHandler.setHandler(contextHandlerCollection);
     server.setHandler(statisticsHandler);
 
+    RequestLog requestLog = builder.requestLog();
+    if (requestLog != null) {
+      server.setRequestLog(requestLog);
+    }
+
     return server;
   }
 

diff --git a/ollie/src/main/java/com/walmartlabs/ollie/OllieServerBuilder.java b/ollie/src/main/java/com/walmartlabs/ollie/OllieServerBuilder.java
@@ -33,6 +33,7 @@
 import com.walmartlabs.ollie.model.StaticResourceDefinition;
 import org.apache.shiro.realm.Realm;
 import org.eclipse.jetty.security.SecurityHandler;
+import org.eclipse.jetty.server.RequestLog;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 
 import javax.servlet.Filter;
@@ -97,6 +98,8 @@ public class OllieServerBuilder {
     Set<OllieShutdownListener> shutdownListeners = Sets.newHashSet();
     private String webServletsPath;
 
+    private RequestLog requestLog;
+
     public OllieServer build() {
         filter("/*").through(CrossOriginFilter.class);
         filter("/*").through(GuiceFilter.class);
@@ -432,4 +435,13 @@ public OllieServerBuilder serveWebServlets(String webServletsPath) {
     public String webServletsPath() {
         return webServletsPath;
     }
+
+    public OllieServerBuilder requestLog(RequestLog requestLog) {
+        this.requestLog = requestLog;
+        return this;
+    }
+
+    public RequestLog requestLog() {
+        return requestLog;
+    }
 }