diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREvent.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREvent.java index 1361464d..b220b9a7 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREvent.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREvent.java @@ -45,7 +45,9 @@ public class CDREvent { public JsonObject toJson() { JsonObject json = new JsonObject(); - json.addProperty("sessionId", this.sessionId); + if (sessionId != null) { + json.addProperty("sessionId", this.sessionId); + } json.addProperty("timestamp", this.timeStamp); return json; } diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventName.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventName.java index 17ea6ec4..0b54209d 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventName.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventName.java @@ -19,6 +19,6 @@ package io.openvidu.server.cdr; public enum CDREventName { - sessionCreated, sessionDestroyed, participantJoined, participantLeft, webrtcConnectionCreated, webrtcConnectionDestroyed, recordingStarted, recordingStopped, recordingStatusChanged, filterEventDispatched + sessionCreated, sessionDestroyed, participantJoined, participantLeft, webrtcConnectionCreated, webrtcConnectionDestroyed, recordingStarted, recordingStopped, recordingStatusChanged, filterEventDispatched, mediaNodeAdded, mediaNodeRemoved } 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 c1c6f9fd..da95fa70 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 @@ -93,10 +93,10 @@ import io.openvidu.server.webhook.CDRLoggerWebhook; public class CallDetailRecord { @Autowired - protected SessionManager sessionManager; + private SessionManager sessionManager; @Autowired - protected OpenviduConfig openviduConfig; + private OpenviduConfig openviduConfig; private Collection loggers; @@ -226,7 +226,7 @@ public class CallDetailRecord { this.log(new CDREventFilterEvent(sessionId, participantId, streamId, filterType, event)); } - private void log(CDREvent event) { + protected void log(CDREvent event) { this.loggers.forEach(logger -> { // TEMP FIX: AVOID SENDING recordingStarted AND recordingStopped EVENTS TO