Change timezone of request log from GMT to local one (apache#841)

yciabaud · Oct 24, 2017 · 7ba3675 · 7ba3675
1 parent e981e5a
commit 7ba3675
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.TimeZone;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
@@ -75,7 +76,6 @@ public class WebService implements AutoCloseable {
 
     public static final String ATTRIBUTE_PULSAR_NAME = "pulsar";
     public static final String HANDLER_CACHE_CONTROL = "max-age=3600";
-    public static final String HANDLER_REQUEST_LOG_TZ = "GMT";
     public static final int NUM_ACCEPTORS = 32; // make it configurable?
     public static final int MAX_CONCURRENT_REQUESTES = 1024; // make it configurable?
 
@@ -195,7 +195,7 @@ public void start() throws PulsarServerException {
             RequestLogHandler requestLogHandler = new RequestLogHandler();
             Slf4jRequestLog requestLog = new Slf4jRequestLog();
             requestLog.setExtended(true);
-            requestLog.setLogTimeZone(WebService.HANDLER_REQUEST_LOG_TZ);
+            requestLog.setLogTimeZone(TimeZone.getDefault().getID());
             requestLog.setLogLatency(true);
             requestLogHandler.setRequestLog(requestLog);
             handlers.add(0, new ContextHandlerCollection());

diff --git a/...overy-service/src/main/java/org/apache/pulsar/discovery/service/server/ServerManager.java b/...overy-service/src/main/java/org/apache/pulsar/discovery/service/server/ServerManager.java
@@ -22,6 +22,7 @@
 import java.security.GeneralSecurityException;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -113,7 +114,7 @@ public void start() throws Exception {
         RequestLogHandler requestLogHandler = new RequestLogHandler();
         Slf4jRequestLog requestLog = new Slf4jRequestLog();
         requestLog.setExtended(true);
-        requestLog.setLogTimeZone("GMT");
+        requestLog.setLogTimeZone(TimeZone.getDefault().getID());
         requestLog.setLogLatency(true);
         requestLogHandler.setRequestLog(requestLog);
         handlers.add(0, new ContextHandlerCollection());

diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/WebServer.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/WebServer.java
@@ -21,6 +21,7 @@
 import java.net.URI;
 import java.security.GeneralSecurityException;
 import java.util.List;
+import java.util.TimeZone;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -106,7 +107,7 @@ public void start() throws Exception {
         RequestLogHandler requestLogHandler = new RequestLogHandler();
         Slf4jRequestLog requestLog = new Slf4jRequestLog();
         requestLog.setExtended(true);
-        requestLog.setLogTimeZone("GMT");
+        requestLog.setLogTimeZone(TimeZone.getDefault().getID());
         requestLog.setLogLatency(true);
         requestLogHandler.setRequestLog(requestLog);
         handlers.add(0, new ContextHandlerCollection());

diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/ProxyServer.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/ProxyServer.java
@@ -24,6 +24,7 @@
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -133,7 +134,7 @@ public void start() throws PulsarServerException {
             RequestLogHandler requestLogHandler = new RequestLogHandler();
             Slf4jRequestLog requestLog = new Slf4jRequestLog();
             requestLog.setExtended(true);
-            requestLog.setLogTimeZone("GMT");
+            requestLog.setLogTimeZone(TimeZone.getDefault().getID());
             requestLog.setLogLatency(true);
             requestLogHandler.setRequestLog(requestLog);
             handlers.add(0, new ContextHandlerCollection());