merlimat closed pull request #2408: add slf4j handler to log web-server log
URL: https://github.com/apache/incubator-pulsar/pull/2408
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerServer.java
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerServer.java
index 3e9a4267d3..1c26c7d078 100644
---
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerServer.java
+++
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerServer.java
@@ -21,6 +21,8 @@
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+import java.util.TimeZone;
+
import javax.servlet.DispatcherType;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.web.AuthenticationFilter;
@@ -32,6 +34,7 @@
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.Slf4jRequestLog;
import java.net.BindException;
import java.net.URI;
@@ -39,6 +42,7 @@
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.handler.RequestLogHandler;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -98,10 +102,19 @@ private void init() {
newServletContextHandler("/admin/v2", new
ResourceConfig(Resources.getApiResources()), workerService));
handlers.add(newServletContextHandler("/", new
ResourceConfig(Resources.getRootResources()), workerService));
+ RequestLogHandler requestLogHandler = new RequestLogHandler();
+ Slf4jRequestLog requestLog = new Slf4jRequestLog();
+ requestLog.setExtended(true);
+ requestLog.setLogTimeZone(TimeZone.getDefault().getID());
+ requestLog.setLogLatency(true);
+ requestLogHandler.setRequestLog(requestLog);
+ handlers.add(0, new ContextHandlerCollection());
+ handlers.add(requestLogHandler);
+
ContextHandlerCollection contexts = new ContextHandlerCollection();
contexts.setHandlers(handlers.toArray(new Handler[handlers.size()]));
HandlerCollection handlerCollection = new HandlerCollection();
- handlerCollection.setHandlers(new Handler[] { contexts, new
DefaultHandler() });
+ handlerCollection.setHandlers(new Handler[] { contexts, new
DefaultHandler(), requestLogHandler });
server.setHandler(handlerCollection);
if (this.workerConfig.isTlsEnabled()) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
