Merge branch 'master' of https://github.com/tananaev/traccar

Conflicts:
	src/org/traccar/database/DataManager.java

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();