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

openvidu-server: KMS events small refactoring

pull/255/head
pabloFuente 2019-03-07 12:04:46 +01:00
parent 3641d90292
commit d22b3b0f5e
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java
View File

@ -43,9 +43,8 @@ public class KurentoParticipantEndpointConfig {
String msg = "KMS event [MediaFlowInStateChange] -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaFlowInStateChange] -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName() + typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName()
+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp(); + " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner().getSessionId(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), event.getMediaType(), event.getMediaType(), endpoint.createdAt());
endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
this.CDR.log(kmsEvent); this.CDR.log(kmsEvent);
this.infoHandler.sendInfo(msg); this.infoHandler.sendInfo(msg);
@ -56,9 +55,8 @@ public class KurentoParticipantEndpointConfig {
String msg = "KMS event [MediaFlowOutStateChange] -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaFlowOutStateChange] -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName() + typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName()
+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp(); + " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner().getSessionId(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), event.getMediaType(), event.getMediaType(), endpoint.createdAt());
endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
this.CDR.log(kmsEvent); this.CDR.log(kmsEvent);
this.infoHandler.sendInfo(msg); this.infoHandler.sendInfo(msg);
@ -68,8 +66,8 @@ public class KurentoParticipantEndpointConfig {
endpoint.getWebEndpoint().addIceGatheringDoneListener(event -> { endpoint.getWebEndpoint().addIceGatheringDoneListener(event -> {
String msg = "KMS event [IceGatheringDone] -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [IceGatheringDone] -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | timestamp: " + event.getTimestamp(); + typeOfEndpoint + ") | timestamp: " + event.getTimestamp();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
this.CDR.log(kmsEvent); this.CDR.log(kmsEvent);
this.infoHandler.sendInfo(msg); this.infoHandler.sendInfo(msg);
@ -80,8 +78,8 @@ public class KurentoParticipantEndpointConfig {
String msg = "KMS event [ConnectionStateChanged]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [ConnectionStateChanged]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | oldState: " + event.getOldState() + " | newState: " + event.getNewState() + typeOfEndpoint + ") | oldState: " + event.getOldState() + " | newState: " + event.getNewState()
+ " | timestamp: " + event.getTimestamp(); + " | timestamp: " + event.getTimestamp();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
this.CDR.log(kmsEvent); this.CDR.log(kmsEvent);
this.infoHandler.sendInfo(msg); this.infoHandler.sendInfo(msg);
@ -94,8 +92,8 @@ public class KurentoParticipantEndpointConfig {
String msg = "KMS event [NewCandidatePairSelected]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [NewCandidatePairSelected]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | local: " + endpoint.selectedLocalIceCandidate + " | remote: " + typeOfEndpoint + ") | local: " + endpoint.selectedLocalIceCandidate + " | remote: "
+ endpoint.selectedRemoteIceCandidate + " | timestamp: " + event.getTimestamp(); + endpoint.selectedRemoteIceCandidate + " | timestamp: " + event.getTimestamp();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
this.CDR.log(kmsEvent); this.CDR.log(kmsEvent);
this.infoHandler.sendInfo(msg); this.infoHandler.sendInfo(msg);
@ -106,9 +104,8 @@ public class KurentoParticipantEndpointConfig {
String msg = "KMS event [MediaTranscodingStateChange]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaTranscodingStateChange]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState().name() + " | mediaType: " + event.getMediaType() + typeOfEndpoint + ") | state: " + event.getState().name() + " | mediaType: " + event.getMediaType()
+ " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestamp(); + " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestamp();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner().getSessionId(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), event.getMediaType(), event.getMediaType(), endpoint.createdAt());
endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
this.CDR.log(kmsEvent); this.CDR.log(kmsEvent);
this.infoHandler.sendInfo(msg); this.infoHandler.sendInfo(msg);
@ -121,8 +118,8 @@ public class KurentoParticipantEndpointConfig {
+ typeOfEndpoint + ") | state: " + event.getState().name() + " | componentId: " + typeOfEndpoint + ") | state: " + event.getState().name() + " | componentId: "
+ event.getComponentId() + " | streamId: " + event.getStreamId() + " | timestamp: " + event.getComponentId() + " | streamId: " + event.getStreamId() + " | timestamp: "
+ event.getTimestamp(); + event.getTimestamp();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
this.CDR.log(kmsEvent); this.CDR.log(kmsEvent);
this.infoHandler.sendInfo(msg); this.infoHandler.sendInfo(msg);
@ -134,8 +131,8 @@ public class KurentoParticipantEndpointConfig {
String msg = "KMS event [ERROR]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint String msg = "KMS event [ERROR]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint
+ ") | errorCode: " + event.getErrorCode() + " | description: " + event.getDescription() + ") | errorCode: " + event.getErrorCode() + " | description: " + event.getDescription()
+ " | timestamp: " + event.getTimestamp(); + " | timestamp: " + event.getTimestamp();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
this.CDR.log(kmsEvent); this.CDR.log(kmsEvent);
this.infoHandler.sendInfo(msg); this.infoHandler.sendInfo(msg);

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

@ -22,19 +22,19 @@ import org.kurento.jsonrpc.JsonUtils;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.openvidu.server.core.Participant;
public class KmsEvent { public class KmsEvent {
long timestamp; long timestamp;
long msSinceCreation; long msSinceCreation;
String sessionId; Participant participant;
String connectionId;
String endpoint; String endpoint;
RaiseBaseEvent event; RaiseBaseEvent event;
public KmsEvent(RaiseBaseEvent event, String sessionId, String connectionId, String endpointName, long createdAt) { public KmsEvent(RaiseBaseEvent event, Participant participant, String endpointName, long createdAt) {
this.event = event; this.event = event;
this.sessionId = sessionId; this.participant = participant;
this.connectionId = connectionId;
this.endpoint = endpointName; this.endpoint = endpointName;
this.timestamp = System.currentTimeMillis(); // TODO: Change to event.getTimestampMillis() this.timestamp = System.currentTimeMillis(); // TODO: Change to event.getTimestampMillis()
this.msSinceCreation = this.timestamp - createdAt; this.msSinceCreation = this.timestamp - createdAt;
@ -46,8 +46,9 @@ public class KmsEvent {
JsonObject json = JsonUtils.toJsonObject(event); JsonObject json = JsonUtils.toJsonObject(event);
json.remove("tags"); json.remove("tags");
json.addProperty("timestamp", timestamp); json.addProperty("timestamp", timestamp);
json.addProperty("session", sessionId); json.addProperty("session", participant.getSessionId());
json.addProperty("connection", connectionId); json.addProperty("user", participant.getFinalUserId());
json.addProperty("connection", participant.getParticipantPublicId());
json.addProperty("endpoint", this.endpoint); json.addProperty("endpoint", this.endpoint);
json.addProperty("msSinceEndpointCreation", msSinceCreation); json.addProperty("msSinceEndpointCreation", msSinceCreation);
return json; return json;

8
openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsMediaEvent.java
View File

@ -22,13 +22,15 @@ import org.kurento.client.MediaType;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.openvidu.server.core.Participant;
public class KmsMediaEvent extends KmsEvent { public class KmsMediaEvent extends KmsEvent {
MediaType mediaType; MediaType mediaType;
public KmsMediaEvent(MediaEvent event, String sessionId, String connectionId, String endpointName, public KmsMediaEvent(MediaEvent event, Participant participant, String endpointName, MediaType mediaType,
MediaType mediaType, long createdAt) { long createdAt) {
super(event, sessionId, connectionId, endpointName, createdAt); super(event, participant, endpointName, createdAt);
this.mediaType = mediaType; this.mediaType = mediaType;
} }