aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-02-27 12:49:44 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-02-27 12:49:44 +1300
commitf3c7e3e6dc28a39f23197beecb2bdac79d6628a3 (patch)
tree067984429fb03cc513f7e99d79d56f33309fd3c9 /src/org/traccar/api
parent4b2c0d922ba422a696579fa9d083b98da51f6861 (diff)
downloadtrackermap-server-f3c7e3e6dc28a39f23197beecb2bdac79d6628a3.tar.gz
trackermap-server-f3c7e3e6dc28a39f23197beecb2bdac79d6628a3.tar.bz2
trackermap-server-f3c7e3e6dc28a39f23197beecb2bdac79d6628a3.zip
Make WebSocket timeout configurable
Diffstat (limited to 'src/org/traccar/api')
-rw-r--r--src/org/traccar/api/AsyncSocketServlet.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/api/AsyncSocketServlet.java b/src/org/traccar/api/AsyncSocketServlet.java
index fbfe248e5..edfa8939b 100644
--- a/src/org/traccar/api/AsyncSocketServlet.java
+++ b/src/org/traccar/api/AsyncSocketServlet.java
@@ -20,6 +20,7 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
+import org.traccar.Context;
import org.traccar.api.resource.SessionResource;
public class AsyncSocketServlet extends WebSocketServlet {
@@ -28,7 +29,7 @@ public class AsyncSocketServlet extends WebSocketServlet {
@Override
public void configure(WebSocketServletFactory factory) {
- factory.getPolicy().setIdleTimeout(ASYNC_TIMEOUT);
+ factory.getPolicy().setIdleTimeout(Context.getConfig().getLong("web.timeout", ASYNC_TIMEOUT));
factory.setCreator(new WebSocketCreator() {
@Override
public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp) {