aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/AsyncSocket.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-06-01 15:28:54 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-06-01 15:28:54 +1200
commit3db183a5535a986b015566c6df929da8c6ca9630 (patch)
tree3183f44e2b9b8ccfa2c460221b1d04fa74f0e9e9 /src/org/traccar/api/AsyncSocket.java
parentcce427a783cbe0c2eca6a278d7327294002847e5 (diff)
parent41c46575a92f746622c61b07004b7a0832712a54 (diff)
downloadtraccar-server-3db183a5535a986b015566c6df929da8c6ca9630.tar.gz
traccar-server-3db183a5535a986b015566c6df929da8c6ca9630.tar.bz2
traccar-server-3db183a5535a986b015566c6df929da8c6ca9630.zip
Merge pull request #1981 from Abyss777/master
Implement events subsystem
Diffstat (limited to 'src/org/traccar/api/AsyncSocket.java')
-rw-r--r--src/org/traccar/api/AsyncSocket.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/org/traccar/api/AsyncSocket.java b/src/org/traccar/api/AsyncSocket.java
index 35e760613..2259f840f 100644
--- a/src/org/traccar/api/AsyncSocket.java
+++ b/src/org/traccar/api/AsyncSocket.java
@@ -20,6 +20,7 @@ import org.eclipse.jetty.websocket.api.WebSocketAdapter;
import org.traccar.Context;
import org.traccar.database.ConnectionManager;
import org.traccar.model.Device;
+import org.traccar.model.Event;
import org.traccar.model.Position;
import org.traccar.web.JsonConverter;
@@ -32,6 +33,7 @@ public class AsyncSocket extends WebSocketAdapter implements ConnectionManager.U
private static final String KEY_DEVICES = "devices";
private static final String KEY_POSITIONS = "positions";
+ private static final String KEY_EVENTS = "events";
private long userId;
@@ -65,6 +67,11 @@ public class AsyncSocket extends WebSocketAdapter implements ConnectionManager.U
sendData(KEY_POSITIONS, Collections.singletonList(position));
}
+ @Override
+ public void onUpdateEvent(Event event) {
+ sendData(KEY_EVENTS, Collections.singletonList(event));
+ }
+
private void sendData(String key, Collection<?> data) {
if (!data.isEmpty() && isConnected()) {
JsonObjectBuilder json = Json.createObjectBuilder();