diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-26 15:06:59 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-26 15:06:59 +1300 |
| commit | ca071f5d23776b6680366217b226dc019308f10b (patch) | |
| tree | 0ae4eccd39174607d6373e2b30cd5832ec0cd942 /src | |
| parent | 76d0088bbb6951dc845bc2b6d4945fdf6eb772f8 (diff) | |
| download | traccar-server-ca071f5d23776b6680366217b226dc019308f10b.tar.gz traccar-server-ca071f5d23776b6680366217b226dc019308f10b.tar.bz2 traccar-server-ca071f5d23776b6680366217b226dc019308f10b.zip | |
Implement global timeout option
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/traccar/BasePipelineFactory.java | 7 |
1 files changed, 5 insertions, 2 deletions
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")) { |