[tor-commits] [metrics-web/master] Make webstats.csv export timezone-independent.

[karsten at torproject.org]

commit 24cfe7d3c0f588322a771bf2bfe955f0b3853b29
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Jan 25 10:14:19 2017 +0100

    Make webstats.csv export timezone-independent.
---
 .../webstats/src/main/java/org/torproject/metrics/webstats/Main.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/webstats/src/main/java/org/torproject/metrics/webstats/Main.java b/modules/webstats/src/main/java/org/torproject/metrics/webstats/Main.java
index 919241b..ea5a368 100644
--- a/modules/webstats/src/main/java/org/torproject/metrics/webstats/Main.java
+++ b/modules/webstats/src/main/java/org/torproject/metrics/webstats/Main.java
@@ -26,6 +26,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -365,10 +366,12 @@ public class Main {
     String queryString = "SELECT " + ALL_COLUMNS + " FROM webstats";
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
     dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"),
+        Locale.US);
     try (ResultSet rs = st.executeQuery(queryString)) {
       while (rs.next()) {
         statistics.add(String.format("%s,%s,%s,%s,%s,%s,%d",
-            dateFormat.format(rs.getDate(LOG_DATE)),
+            dateFormat.format(rs.getDate(LOG_DATE, calendar)),
             emptyNull(rs.getString(REQUEST_TYPE)),
             emptyNull(rs.getString(PLATFORM)),
             emptyNull(rs.getString(CHANNEL)),