From c0dee04079cb2edb855e6eeeab9cb6f1b43fa465 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <atananaev@lyft.com>
Date: Tue, 29 Dec 2020 11:22:01 -0800
Subject: Migrate keys and remove database cleanup

---
 src/main/java/org/traccar/config/Keys.java | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/traccar/config')

diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java
index 4531c7541..f1efa7515 100644
--- a/src/main/java/org/traccar/config/Keys.java
+++ b/src/main/java/org/traccar/config/Keys.java
@@ -161,13 +161,28 @@ public final class Keys {
             "database.changelog",
             Collections.singletonList(KeyType.GLOBAL));
 
+    /**
+     * Automatically generate SQL database queries when possible.
+     */
+    public static final ConfigKey<Boolean> DATABASE_GENERATE_QUERIES = new ConfigKey<>(
+            "database.generateQueries",
+            Collections.singletonList(KeyType.GLOBAL));
+
+    /**
+     * Database connection pool size. Default value is defined by the HikariCP library.
+     */
+    public static final ConfigKey<Integer> DATABASE_MAX_POOL_SIZE = new ConfigKey<>(
+            "database.maxPoolSize",
+            Collections.singletonList(KeyType.GLOBAL));
+
     /**
      * SQL query to check connection status. Default value is 'SELECT 1'. For Oracle database you can use
      * 'SELECT 1 FROM DUAL'.
      */
     public static final ConfigKey<String> DATABASE_CHECK_CONNECTION = new ConfigKey<>(
             "database.checkConnection",
-            Collections.singletonList(KeyType.GLOBAL));
+            Collections.singletonList(KeyType.GLOBAL),
+            "SELECT 1");
 
     /**
      * Store original HEX or string data as "raw" attribute in the corresponding position.
@@ -320,6 +335,13 @@ public final class Keys {
             Collections.singletonList(KeyType.GLOBAL),
             60000L);
 
+    /**
+     * Authentication sessions timeout in seconds. By default no timeout.
+     */
+    public static final ConfigKey<Integer> WEB_SESSION_TIMEOUT = new ConfigKey<>(
+            "web.sessionTimeout",
+            Collections.singletonList(KeyType.GLOBAL));
+
     /**
      * Enable positions forwarding to other web server.
      */
-- 
cgit v1.2.3