From 9c9370f72c51d7466d3b25a59264ee98f4319b3a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 8 Nov 2018 13:37:38 +1300
Subject: Fix time formatting issues

---
 src/org/traccar/database/DataManager.java       | 5 ++---
 src/org/traccar/database/StatisticsManager.java | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/database')

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 65f67ce44..8da6f2cca 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -20,7 +20,6 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.sql.SQLException;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -42,6 +41,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.Config;
 import org.traccar.Context;
+import org.traccar.helper.DateUtil;
 import org.traccar.model.Attribute;
 import org.traccar.model.Device;
 import org.traccar.model.Driver;
@@ -363,8 +363,7 @@ public class DataManager {
         long historyDays = config.getInteger("database.historyDays");
         if (historyDays != 0) {
             Date timeLimit = new Date(System.currentTimeMillis() - historyDays * 24 * 3600 * 1000);
-            LOGGER.info(
-                    "Clearing history earlier than " + new SimpleDateFormat(Context.DATE_FORMAT).format(timeLimit));
+            LOGGER.info("Clearing history earlier than " + DateUtil.formatDate(timeLimit, false));
             QueryBuilder.create(dataSource, getQuery("database.deletePositions"))
                     .setDate("serverTime", timeLimit)
                     .executeUpdate();
diff --git a/src/org/traccar/database/StatisticsManager.java b/src/org/traccar/database/StatisticsManager.java
index 735c1f1a7..4e656bfd8 100644
--- a/src/org/traccar/database/StatisticsManager.java
+++ b/src/org/traccar/database/StatisticsManager.java
@@ -18,6 +18,7 @@ package org.traccar.database;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.Context;
+import org.traccar.helper.DateUtil;
 import org.traccar.model.Statistics;
 
 import javax.ws.rs.client.Entity;
@@ -71,7 +72,7 @@ public class StatisticsManager {
 
             String url = Context.getConfig().getString("server.statistics");
             if (url != null) {
-                String time = Context.DATE_FORMATTER.format(statistics.getCaptureTime().toInstant());
+                String time = DateUtil.formatDate(statistics.getCaptureTime());
 
                 Form form = new Form();
                 form.param("version", Context.getAppVersion());
-- 
cgit v1.2.3