From ca071f5d23776b6680366217b226dc019308f10b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 26 Mar 2017 15:06:59 +1300 Subject: Implement global timeout option --- src/org/traccar/BasePipelineFactory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/BasePipelineFactory.java') diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index 775d609a7..33f778885 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -112,9 +112,12 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { public BasePipelineFactory(TrackerServer server, String protocol) { this.server = server; - timeout = Context.getConfig().getInteger(protocol + ".timeout", 0); + timeout = Context.getConfig().getInteger(protocol + ".timeout"); if (timeout == 0) { - timeout = Context.getConfig().getInteger(protocol + ".resetDelay", 0); // temporary + timeout = Context.getConfig().getInteger(protocol + ".resetDelay"); // temporary + if (timeout == 0) { + timeout = Context.getConfig().getInteger("server.timeout"); + } } if (Context.getConfig().getBoolean("filter.enable")) { -- cgit v1.2.3