From bae6692356872fcc093ce92ed37cba7d2e2f6d7f Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 3 Oct 2016 12:16:15 +0500 Subject: Make status events switchable --- src/org/traccar/database/ConnectionManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/org') diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java index 46ccab81e..b12899711 100644 --- a/src/org/traccar/database/ConnectionManager.java +++ b/src/org/traccar/database/ConnectionManager.java @@ -40,6 +40,7 @@ public class ConnectionManager { private static final long DEFAULT_TIMEOUT = 600; private final long deviceTimeout; + private final boolean statusHandler; private final Map activeDevices = new HashMap<>(); private final Map> listeners = new HashMap<>(); @@ -47,6 +48,7 @@ public class ConnectionManager { public ConnectionManager() { deviceTimeout = Context.getConfig().getLong("status.timeout", DEFAULT_TIMEOUT) * 1000; + statusHandler = Context.getConfig().getBoolean("event.statusHandler"); } public void addActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) { @@ -73,7 +75,7 @@ public class ConnectionManager { return; } - if (!status.equals(device.getStatus())) { + if (statusHandler && !status.equals(device.getStatus())) { Event event = new Event(Event.TYPE_DEVICE_OFFLINE, deviceId); if (status.equals(Device.STATUS_ONLINE)) { event.setType(Event.TYPE_DEVICE_ONLINE); -- cgit v1.2.3 From c3fef40aa7ecba063c9a46f8c6e150d7ca5128d3 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 3 Oct 2016 15:03:02 +0500 Subject: Rename variable --- src/org/traccar/database/ConnectionManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/org') diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java index b12899711..2017e81a0 100644 --- a/src/org/traccar/database/ConnectionManager.java +++ b/src/org/traccar/database/ConnectionManager.java @@ -40,7 +40,7 @@ public class ConnectionManager { private static final long DEFAULT_TIMEOUT = 600; private final long deviceTimeout; - private final boolean statusHandler; + private final boolean enableStatusEvents; private final Map activeDevices = new HashMap<>(); private final Map> listeners = new HashMap<>(); @@ -48,7 +48,7 @@ public class ConnectionManager { public ConnectionManager() { deviceTimeout = Context.getConfig().getLong("status.timeout", DEFAULT_TIMEOUT) * 1000; - statusHandler = Context.getConfig().getBoolean("event.statusHandler"); + enableStatusEvents = Context.getConfig().getBoolean("event.statusHandler"); } public void addActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) { @@ -75,7 +75,7 @@ public class ConnectionManager { return; } - if (statusHandler && !status.equals(device.getStatus())) { + if (enableStatusEvents && !status.equals(device.getStatus())) { Event event = new Event(Event.TYPE_DEVICE_OFFLINE, deviceId); if (status.equals(Device.STATUS_ONLINE)) { event.setType(Event.TYPE_DEVICE_ONLINE); -- cgit v1.2.3