Clear event history (fix #3160)

traccar · May 11, 2017 · dd32e2d · dd32e2d
1 parent b5a311c
commit dd32e2d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/setup/default.xml b/setup/default.xml
@@ -289,6 +289,10 @@
         DELETE FROM positions WHERE serverTime &lt; :serverTime AND id NOT IN (SELECT positionId FROM devices)
     </entry>
 
+    <entry key='database.deleteEvents'>
+        DELETE FROM events WHERE serverTime &lt; :serverTime
+    </entry>
+
     <entry key='database.selectAttributeAliases'>
         SELECT * FROM attribute_aliases
     </entry>

diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java
@@ -44,7 +44,7 @@ public static void main(String[] args) throws Exception {
             @Override
             public void run() {
                 try {
-                    Context.getDataManager().clearPositionsHistory();
+                    Context.getDataManager().clearHistory();
                 } catch (SQLException error) {
                     Log.warning(error);
                 }

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
@@ -308,12 +308,15 @@ public Collection<Position> getLatestPositions() throws SQLException {
                 .executeQuery(Position.class);
     }
 
-    public void clearPositionsHistory() throws SQLException {
-        long historyDays = config.getInteger("database.positionsHistoryDays");
+    public void clearHistory() throws SQLException {
+        long historyDays = config.getInteger("database.historyDays");
         if (historyDays != 0) {
             QueryBuilder.create(dataSource, getQuery("database.deletePositions"))
                     .setDate("serverTime", new Date(System.currentTimeMillis() - historyDays * 24 * 3600 * 1000))
                     .executeUpdate();
+            QueryBuilder.create(dataSource, getQuery("database.deleteEvents"))
+                    .setDate("serverTime", new Date(System.currentTimeMillis() - historyDays * 24 * 3600 * 1000))
+                    .executeUpdate();
         }
     }