From b55072b394262d32db94d0c696f4eb537b6e9e11 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Wed, 23 Dec 2020 12:27:20 +0100 Subject: [PATCH] openvidu-server: environmentId on mediaServerCrashed --- .../openvidu/server/cdr/CDREventMediaServerCrashed.java | 8 +++++++- .../java/io/openvidu/server/cdr/CallDetailRecord.java | 4 ++-- .../io/openvidu/server/core/SessionEventsHandler.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventMediaServerCrashed.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventMediaServerCrashed.java index 46e8c604..fec4a96a 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventMediaServerCrashed.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventMediaServerCrashed.java @@ -7,16 +7,22 @@ import io.openvidu.server.kurento.kms.Kms; public class CDREventMediaServerCrashed extends CDREvent { 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); this.kms = kms; + this.environmentId = environmentId; } @Override public JsonObject toJson() { JsonObject json = super.toJson(); json.addProperty("id", this.kms.getId()); + if (this.environmentId != null) { + json.addProperty("environmentId", this.environmentId); + } json.addProperty("ip", this.kms.getIp()); json.addProperty("uri", this.kms.getUri()); return json; diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java index 82ebbefb..990fa4f9 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java @@ -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, - kms); + kms, environmentId); this.log(e); } diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java b/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java index a0d6581c..e4c780bd 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java @@ -608,7 +608,7 @@ public class SessionEventsHandler { } public void onMediaServerCrashed(Kms kms, long timeOfKurentoDisconnection) { - CDR.recordMediaServerCrashed(kms, timeOfKurentoDisconnection); + CDR.recordMediaServerCrashed(kms, null, timeOfKurentoDisconnection); } protected Set filterParticipantsByRole(OpenViduRole[] roles, Set participants) {