aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/web
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-07-12 16:04:40 +0300
committerninioe <ninioe@gmail.com>2016-07-12 16:04:40 +0300
commitd045c1e2174146ddc8ad8b2ef4442863f3d84a11 (patch)
tree458ac9a09ef9df6426a34067072164c44ac18020 /src/org/traccar/web
parent8d5b4ec5ec8e4aaa2c34793e3100a7782551afbd (diff)
downloadtrackermap-server-d045c1e2174146ddc8ad8b2ef4442863f3d84a11.tar.gz
trackermap-server-d045c1e2174146ddc8ad8b2ef4442863f3d84a11.tar.bz2
trackermap-server-d045c1e2174146ddc8ad8b2ef4442863f3d84a11.zip
Added support for Alarm popup & positions history cleaner
1. added support for Alarm and Alarm Type in popup and also in history records. can be muted with a toggle button in the UI 2. added a timer to clear positions history once a day. the default is to save positions history for 7 days if not defined in the configuration file. 3. prevent the lock of the UI files (js, html, css, etc..) for wondows developers in debug mode. It's easier to do changes to the UI without stopping the app each time. 4. tools: added support in test-generator.py to simulate Alert, also added minify.bat file to compile new js files for the UI using sencha SDK for windows developers
Diffstat (limited to 'src/org/traccar/web')
-rw-r--r--src/org/traccar/web/WebServer.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 5527e80f3..73702cc3d 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -118,6 +118,13 @@ public class WebServer {
resourceHandler.setResourceBase(config.getString("web.path"));
if (config.getBoolean("web.debug")) {
resourceHandler.setWelcomeFiles(new String[] {"debug.html"});
+ //Troubleshooting Locked Files on Windows (changed by Erez)
+ resourceHandler.setMinMemoryMappedContentLength(-1);
+
+ /*DefaultServlet defaultServlet = new DefaultServlet();
+ ServletHolder holder = new ServletHolder(defaultServlet);
+ holder.setInitParameter("useFileMappedBuffer", "false");
+ handler.addServlet(holder, "/");*/
} else {
resourceHandler.setWelcomeFiles(new String[] {"release.html", "index.html"});
}