ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: common KmsEvent toJson

pull/255/head
pabloFuente 2019-03-01 16:57:49 +01:00
parent 16ccaae268
commit a2a7828c9d
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java
View File

@ -17,9 +17,8 @@
package io.openvidu.server.kurento.endpoint;
import org.kurento.client.ErrorEvent;
import org.kurento.client.MediaEvent;
import org.kurento.client.RaiseBaseEvent;
import org.kurento.jsonrpc.JsonUtils;
import com.google.gson.JsonObject;
@ -44,22 +43,12 @@ public class KmsEvent {
}
public JsonObject toJson() {
JsonObject json = new JsonObject();
if (event instanceof ErrorEvent) {
ErrorEvent errorEvent = (ErrorEvent) event;
json.addProperty("eventType", errorEvent.getType());
json.addProperty("errorCode", errorEvent.getErrorCode());
json.addProperty("description", errorEvent.getDescription());
} else {
MediaEvent mediaEvent = (MediaEvent) event;
json.addProperty("eventType", mediaEvent.getType());
}
JsonObject json = JsonUtils.toJsonObject(event);
json.remove("tags");
json.addProperty("timestamp", timestamp);
json.addProperty("session", sessionId);
json.addProperty("connection", connectionId);
json.addProperty("endpoint", this.endpoint);
json.addProperty("timestamp", timestamp);
json.addProperty("msSinceEndpointCreation", msSinceCreation);
return json;
}

16
openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java
View File

@ -34,7 +34,6 @@ import org.kurento.client.OnIceCandidateEvent;
import org.kurento.client.RtpEndpoint;
import org.kurento.client.SdpEndpoint;
import org.kurento.client.WebRtcEndpoint;
import org.kurento.jsonrpc.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -501,14 +500,13 @@ public abstract class MediaEndpoint {
}
JsonArray jsonArray = new JsonArray();
for (KmsEvent event : this.kmsEvents) {
JsonObject jsonKmsEvent = JsonUtils.toJsonObject(event.event);
// Set custom more precise timestamp
jsonKmsEvent.addProperty("timestamp", event.timestamp);
// Set milliseconds since the Publisher or Subscriber started transmitting media
jsonKmsEvent.addProperty("msSinceCreation", event.msSinceCreation);
jsonArray.add(jsonKmsEvent);
}
this.kmsEvents.forEach(ev -> {
JsonObject j = ev.toJson();
j.remove("session");
j.remove("connection");
j.remove("endpoint");
jsonArray.add(j);
});
json.add("events", jsonArray);
return json;