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

openvidu-server: source property removed from MediaEndpoint KMS events info

pull/255/head
pabloFuente 2019-03-01 16:19:27 +01:00
parent da73d96278
commit 16ccaae268
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,7 +212,10 @@ public abstract class MediaEndpoint {
} }
public String getEndpointName() { public String getEndpointName() {
return endpointName != null ? endpointName : this.getEndpoint().getName(); if (endpointName == null) {
endpointName = this.getEndpoint().getName();
}
return endpointName;
} }
public void setEndpointName(String endpointName) { public void setEndpointName(String endpointName) {
@ -487,7 +490,7 @@ public abstract class MediaEndpoint {
public JsonObject withStatsToJson() { public JsonObject withStatsToJson() {
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
json.addProperty("createdAt", this.createdAt); json.addProperty("createdAt", this.createdAt);
json.addProperty("webrtcEndpointName", this.getEndpoint().getName()); json.addProperty("webrtcEndpointName", this.getEndpointName());
json.addProperty("remoteSdp", this.getEndpoint().getRemoteSessionDescriptor()); json.addProperty("remoteSdp", this.getEndpoint().getRemoteSessionDescriptor());
json.addProperty("localSdp", this.getEndpoint().getLocalSessionDescriptor()); json.addProperty("localSdp", this.getEndpoint().getLocalSessionDescriptor());
json.add("receivedCandidates", new GsonBuilder().create().toJsonTree(this.receivedCandidateList)); json.add("receivedCandidates", new GsonBuilder().create().toJsonTree(this.receivedCandidateList));
@ -500,8 +503,6 @@ public abstract class MediaEndpoint {
JsonArray jsonArray = new JsonArray(); JsonArray jsonArray = new JsonArray();
for (KmsEvent event : this.kmsEvents) { for (KmsEvent event : this.kmsEvents) {
JsonObject jsonKmsEvent = JsonUtils.toJsonObject(event.event); JsonObject jsonKmsEvent = JsonUtils.toJsonObject(event.event);
// Set source name
jsonKmsEvent.addProperty("source", event.endpoint);
// Set custom more precise timestamp // Set custom more precise timestamp
jsonKmsEvent.addProperty("timestamp", event.timestamp); jsonKmsEvent.addProperty("timestamp", event.timestamp);
// Set milliseconds since the Publisher or Subscriber started transmitting media // Set milliseconds since the Publisher or Subscriber started transmitting media