From 94f87ea207558f6b03eeaf49dd2527dcfe0472ba Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Sat, 28 Apr 2018 16:14:24 +0500 Subject: Make Commands queueing switchable --- src/org/traccar/Context.java | 2 +- src/org/traccar/database/CommandsManager.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/org/traccar') diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 67fd02f75..30e6ca713 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -391,7 +391,7 @@ public final class Context { driversManager = new DriversManager(dataManager); - commandsManager = new CommandsManager(dataManager); + commandsManager = new CommandsManager(dataManager, config.getBoolean("commands.queueing")); statisticsManager = new StatisticsManager(); diff --git a/src/org/traccar/database/CommandsManager.java b/src/org/traccar/database/CommandsManager.java index 9ceb995ef..e59762d10 100644 --- a/src/org/traccar/database/CommandsManager.java +++ b/src/org/traccar/database/CommandsManager.java @@ -37,8 +37,11 @@ public class CommandsManager extends ExtendedObjectManager { private final Map> deviceQueues = new ConcurrentHashMap<>(); - public CommandsManager(DataManager dataManager) { + private boolean queueing; + + public CommandsManager(DataManager dataManager, boolean queueing) { super(dataManager, Command.class); + this.queueing = queueing; } public boolean checkDeviceCommand(long deviceId, long commandId) { @@ -70,6 +73,8 @@ public class CommandsManager extends ExtendedObjectManager { ActiveDevice activeDevice = Context.getConnectionManager().getActiveDevice(deviceId); if (activeDevice != null) { activeDevice.sendCommand(command); + } else if (!queueing) { + throw new RuntimeException("Commands queueing is not enabled"); } else { getDeviceQueue(deviceId).add(command); return false; -- cgit v1.2.3 From 4086a60931b85717af7ce6e52a1945fab762dc8c Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Sat, 28 Apr 2018 16:30:24 +0500 Subject: Change error string --- src/org/traccar/database/CommandsManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/traccar') diff --git a/src/org/traccar/database/CommandsManager.java b/src/org/traccar/database/CommandsManager.java index e59762d10..8ddced5f7 100644 --- a/src/org/traccar/database/CommandsManager.java +++ b/src/org/traccar/database/CommandsManager.java @@ -74,7 +74,7 @@ public class CommandsManager extends ExtendedObjectManager { if (activeDevice != null) { activeDevice.sendCommand(command); } else if (!queueing) { - throw new RuntimeException("Commands queueing is not enabled"); + throw new RuntimeException("Device is not online"); } else { getDeviceQueue(deviceId).add(command); return false; -- cgit v1.2.3