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

openvidu-server: environmentId on mediaServerCrashed

pull/581/head
pabloFuente 2020-12-23 12:27:20 +01:00
parent c98276a196
commit b55072b394
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventMediaServerCrashed.java
View File

@ -7,16 +7,22 @@ import io.openvidu.server.kurento.kms.Kms;
public class CDREventMediaServerCrashed extends CDREvent { public class CDREventMediaServerCrashed extends CDREvent {
private Kms kms; private Kms kms;
private String environmentId;
public CDREventMediaServerCrashed(CDREventName eventName, String sessionId, Long timeStamp, Kms kms) { public CDREventMediaServerCrashed(CDREventName eventName, String sessionId, Long timeStamp, Kms kms,
String environmentId) {
super(eventName, sessionId, timeStamp); super(eventName, sessionId, timeStamp);
this.kms = kms; this.kms = kms;
this.environmentId = environmentId;
} }
@Override @Override
public JsonObject toJson() { public JsonObject toJson() {
JsonObject json = super.toJson(); JsonObject json = super.toJson();
json.addProperty("id", this.kms.getId()); json.addProperty("id", this.kms.getId());
if (this.environmentId != null) {
json.addProperty("environmentId", this.environmentId);
}
json.addProperty("ip", this.kms.getIp()); json.addProperty("ip", this.kms.getIp());
json.addProperty("uri", this.kms.getUri()); json.addProperty("uri", this.kms.getUri());
return json; return json;

4
openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java
View File

@ -217,9 +217,9 @@ public class CallDetailRecord {
}); });
} }
public void recordMediaServerCrashed(Kms kms, long timeOfKurentoDisconnection) { public void recordMediaServerCrashed(Kms kms, String environmentId, long timeOfKurentoDisconnection) {
CDREvent e = new CDREventMediaServerCrashed(CDREventName.mediaServerCrashed, null, timeOfKurentoDisconnection, CDREvent e = new CDREventMediaServerCrashed(CDREventName.mediaServerCrashed, null, timeOfKurentoDisconnection,
kms); kms, environmentId);
this.log(e); this.log(e);
} }

2
openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java
View File

@ -608,7 +608,7 @@ public class SessionEventsHandler {
} }
public void onMediaServerCrashed(Kms kms, long timeOfKurentoDisconnection) { public void onMediaServerCrashed(Kms kms, long timeOfKurentoDisconnection) {
CDR.recordMediaServerCrashed(kms, timeOfKurentoDisconnection); CDR.recordMediaServerCrashed(kms, null, timeOfKurentoDisconnection);
} }
protected Set<Participant> filterParticipantsByRole(OpenViduRole[] roles, Set<Participant> participants) { protected Set<Participant> filterParticipantsByRole(OpenViduRole[] roles, Set<Participant> participants) {