aboutsummaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-30 12:07:43 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-30 12:07:43 +0500
commit80119f59a0d4b89396f5d7d57ba2d80257a8da79 (patch)
treef8a55519dac687f9d9f1518f16c148310a915353 /setup
parent6e00239038002aa383cce39be7f53b85f3d03a94 (diff)
downloadtrackermap-server-80119f59a0d4b89396f5d7d57ba2d80257a8da79.tar.gz
trackermap-server-80119f59a0d4b89396f5d7d57ba2d80257a8da79.tar.bz2
trackermap-server-80119f59a0d4b89396f5d7d57ba2d80257a8da79.zip
- Style fixes (use lower camel case in all cases)
- Added TYPE_prefix for event.type strings - Removed commented code - Removed "database.selectLastEvents" because it is not cross-database. Do the same via code.
Diffstat (limited to 'setup')
-rw-r--r--setup/unix/traccar.xml12
-rw-r--r--setup/windows/traccar.xml12
2 files changed, 8 insertions, 16 deletions
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index a27c9790b..22b71e204 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -17,12 +17,12 @@
<entry key='logger.level'>all</entry>
<entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
- <entry key='event.suppressrepeated'>60</entry>
+ <entry key='event.suppressRepeated'>60</entry>
- <entry key='event.overspeedhandler'>true</entry>
- <entry key='event.globalspeedlimit'>90</entry>
+ <entry key='event.overspeedHandler'>true</entry>
+ <entry key='event.globalSpeedLimit'>90</entry>
- <entry key='event.motionhandler'>true</entry>
+ <entry key='event.motionHandler'>true</entry>
<!-- DATABASE CONFIG -->
@@ -185,10 +185,6 @@
SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime BETWEEN :from AND :to ORDER BY eventTime DESC;
</entry>
- <entry key='database.selectLastEvents'>
- SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime >= NOW() - INTERVAL :interval SECOND ORDER BY eventTime DESC;
- </entry>
-
<!-- PROTOCOL CONFIG -->
<entry key='gps103.port'>5001</entry>
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index d60640375..649c3bb15 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -17,12 +17,12 @@
<entry key='logger.level'>all</entry>
<entry key='logger.file'>[LOG]</entry>
- <entry key='event.suppressrepeated'>60</entry>
+ <entry key='event.suppressRepeated'>60</entry>
- <entry key='event.overspeedhandler'>true</entry>
- <entry key='event.globalspeedlimit'>90</entry>
+ <entry key='event.overspeedHandler'>true</entry>
+ <entry key='event.globalSpeedLimit'>90</entry>
- <entry key='event.motionhandler'>true</entry>
+ <entry key='event.motionHandler'>true</entry>
<!-- DATABASE CONFIG -->
@@ -185,10 +185,6 @@
SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime BETWEEN :from AND :to ORDER BY eventTime DESC;
</entry>
- <entry key='database.selectLastEvents'>
- SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime >= NOW() - INTERVAL :interval SECOND ORDER BY eventTime DESC;
- </entry>
-
<!-- PROTOCOL CONFIG -->
<entry key='gps103.port'>5001</entry>