From 1f7e9473e1bc0faff0feab20c5b5f801df285ba3 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 7 May 2016 10:47:28 +1200 Subject: Rename reset delay to timeout --- debug.xml | 1 + src/org/traccar/BasePipelineFactory.java | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debug.xml b/debug.xml index a70940108..683957eed 100644 --- a/debug.xml +++ b/debug.xml @@ -196,6 +196,7 @@ 5001 + 5 5002 5003 5004 diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index c166f47f4..41053cde2 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -36,7 +36,7 @@ import java.net.InetSocketAddress; public abstract class BasePipelineFactory implements ChannelPipelineFactory { private final TrackerServer server; - private final int resetDelay; + private int timeout; private FilterHandler filterHandler; private DistanceHandler distanceHandler; @@ -95,7 +95,10 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { public BasePipelineFactory(TrackerServer server, String protocol) { this.server = server; - resetDelay = Context.getConfig().getInteger(protocol + ".resetDelay", 0); + timeout = Context.getConfig().getInteger(protocol + ".timeout", 0); + if (timeout == 0) { + timeout = Context.getConfig().getInteger(protocol + ".resetDelay", 0); // temporary + } if (Context.getConfig().getBoolean("filter.enable")) { filterHandler = new FilterHandler(); @@ -126,8 +129,8 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { @Override public ChannelPipeline getPipeline() { ChannelPipeline pipeline = Channels.pipeline(); - if (resetDelay != 0) { - pipeline.addLast("idleHandler", new IdleStateHandler(GlobalTimer.getTimer(), resetDelay, 0, 0)); + if (timeout != 0) { + pipeline.addLast("idleHandler", new IdleStateHandler(GlobalTimer.getTimer(), timeout, 0, 0)); } pipeline.addLast("openHandler", new OpenChannelHandler(server)); if (Context.isLoggerEnabled()) { -- cgit v1.2.3