aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-06-09 10:30:49 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-06-09 10:30:49 +1200
commitcbc7ebd663ad71b1ff5882ffa3dd920c9c81b60d (patch)
tree649230f6f8399e277840ce68f031fcc22adfc767
parent0e983a5c13232a8112fcd81bb4be016ea1022deb (diff)
parent51278b0663f2daa6f3ba33c82e6e9c4b00163410 (diff)
downloadtrackermap-server-cbc7ebd663ad71b1ff5882ffa3dd920c9c81b60d.tar.gz
trackermap-server-cbc7ebd663ad71b1ff5882ffa3dd920c9c81b60d.tar.bz2
trackermap-server-cbc7ebd663ad71b1ff5882ffa3dd920c9c81b60d.zip
Merge pull request #2003 from drecchia/master-hikari-fix
Fix connection check sql
-rw-r--r--debug.xml4
-rw-r--r--setup/unix/traccar.xml4
-rw-r--r--setup/windows/traccar.xml4
-rw-r--r--src/org/traccar/database/DataManager.java2
4 files changed, 13 insertions, 1 deletions
diff --git a/debug.xml b/debug.xml
index a70940108..523cbad17 100644
--- a/debug.xml
+++ b/debug.xml
@@ -54,6 +54,10 @@
<entry key='database.changelog'>./database/changelog-master.xml</entry>
+ <entry key='database.checkConnection'>
+ SELECT 1;
+ </entry>
+
<entry key='database.selectServers'>
SELECT * FROM server;
</entry>
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index a0233e601..4188bc422 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -32,6 +32,10 @@
<entry key='database.password'></entry>
<entry key='database.changelog'>/opt/traccar/data/changelog-master.xml</entry>
+
+ <entry key='database.checkConnection'>
+ SELECT 1;
+ </entry>
<entry key='database.selectServers'>
SELECT * FROM server;
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index 5748f3993..767d1dc84 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -33,6 +33,10 @@
<entry key='database.changelog'>[CHANGELOG]</entry>
+ <entry key='database.checkConnection'>
+ SELECT 1;
+ </entry>
+
<entry key='database.selectServers'>
SELECT * FROM server;
</entry>
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index ad7c4478b..4e69d1d8e 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -117,7 +117,7 @@ public class DataManager implements IdentityManager {
hikariConfig.setJdbcUrl(config.getString("database.url"));
hikariConfig.setUsername(config.getString("database.user"));
hikariConfig.setPassword(config.getString("database.password"));
- hikariConfig.setConnectionInitSql("SELECT 1 FROM DUAL");
+ hikariConfig.setConnectionInitSql(config.getString("database.checkConnection"));
hikariConfig.setIdleTimeout(600000);
int maxPoolSize = config.getInteger("database.maxPoolSize");